diff --git a/.gitignore b/.gitignore index b390ecc64..a5f42e73e 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ bin/ build/ jars/ out/ +classes/ # Debug artifacts run diff --git a/build.gradle b/build.gradle index 012e0f919..912ac2ceb 100644 --- a/build.gradle +++ b/build.gradle @@ -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 diff --git a/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/itemgroup/FabricCreativeGuiComponents.java b/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/itemgroup/FabricCreativeGuiComponents.java index 179af8f6d..51995b6bc 100644 --- a/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/itemgroup/FabricCreativeGuiComponents.java +++ b/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/itemgroup/FabricCreativeGuiComponents.java @@ -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) { diff --git a/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/ItemRenderContext.java b/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/ItemRenderContext.java index becca9243..b4383e912 100644 --- a/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/ItemRenderContext.java +++ b/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/ItemRenderContext.java @@ -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); } }