FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-03-24 22:11:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

19w34a - not being built just yet

Browse source
This commit is contained in:
modmuss50 2019-08-22 19:07:25 +01:00
parent 9f55aa704f
commit ef6e16884f
4 changed files with 9 additions and 9 deletions
.gitignorebuild.gradle
fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/itemgroup
FabricCreativeGuiComponents.java
fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render
ItemRenderContext.java

1
.gitignore vendored
View file

@ -20,6 +20,7 @@ bin/
build/
jars/
out/
classes/
# Debug artifacts
run

4
build.gradle
View file

@ -13,8 +13,8 @@ def ENV = System.getenv()
class Globals {
static def baseVersion = "0.3.1"
static def mcVersion = "1.14.4"
static def yarnVersion = "+build.1"
static def mcVersion = "19w34a"
static def yarnVersion = "+build.2"
}
import org.apache.commons.codec.digest.DigestUtils

6
fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/itemgroup/FabricCreativeGuiComponents.java
View file

@ -16,7 +16,7 @@
package net.fabricmc.fabric.impl.itemgroup;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
@ -61,8 +61,8 @@ public class FabricCreativeGuiComponents {
if (this.visible) {
MinecraftClient minecraftClient = MinecraftClient.getInstance();
minecraftClient.getTextureManager().bindTexture(BUTTON_TEX);
GlStateManager.disableLighting();
GlStateManager.color4f(1F, 1F, 1F, 1F);
RenderSystem.disableLighting();
RenderSystem.color4f(1F, 1F, 1F, 1F);
this.blit(this.x, this.y, (type == Type.NEXT ? 12 : 0), (active ? 0 : 12), 12, 12);
if (mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height) {

7
fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/ItemRenderContext.java
View file

@ -21,10 +21,9 @@ import java.util.Random;
import java.util.function.Consumer;
import java.util.function.Supplier;
import com.mojang.blaze3d.systems.RenderSystem;
import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.platform.GlStateManager;
import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh;
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
@ -112,7 +111,7 @@ public class ItemRenderContext extends AbstractRenderContext implements RenderCo
tessellator.draw();
if(smoothShading) {
GlStateManager.shadeModel(GL11.GL_FLAT);
RenderSystem.shadeModel(GL11.GL_FLAT);
smoothShading = false;
}
@ -167,7 +166,7 @@ public class ItemRenderContext extends AbstractRenderContext implements RenderCo
private void handleShading() {
if(!smoothShading && editorQuad.hasVertexNormals()) {
smoothShading = true;
GlStateManager.shadeModel(GL11.GL_SMOOTH);
RenderSystem.shadeModel(GL11.GL_SMOOTH);
}
}