diff --git a/build.gradle b/build.gradle index 20d04d4b8..5f0b56dbe 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,8 @@ plugins { def ENV = System.getenv() class Globals { - static def baseVersion = "0.4.11" - static def mcVersion = "19w45b" + static def baseVersion = "0.4.12" + static def mcVersion = "19w46a" static def yarnVersion = "+build.1" } diff --git a/fabric-renderer-indigo/build.gradle b/fabric-renderer-indigo/build.gradle index ceb464404..2530f8c49 100644 --- a/fabric-renderer-indigo/build.gradle +++ b/fabric-renderer-indigo/build.gradle @@ -1,5 +1,5 @@ archivesBaseName = "fabric-renderer-indigo" -version = getSubprojectVersion(project, "0.2.12") +version = getSubprojectVersion(project, "0.2.13") dependencies { compile project(path: ':fabric-api-base', configuration: 'dev') diff --git a/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/BlockRenderContext.java b/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/BlockRenderContext.java index 77b4509a8..bea9cc5bf 100644 --- a/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/BlockRenderContext.java +++ b/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/BlockRenderContext.java @@ -80,8 +80,8 @@ public class BlockRenderContext extends AbstractRenderContext implements RenderC this.vanillaRenderer = vanillaRenderer; this.bufferBuilder = buffer; this.matrixStack = matrixStack; - this.matrix = matrixStack.method_23760().method_23761(); - this.normalMatrix = matrixStack.method_23760().method_23762(); + this.matrix = matrixStack.peek().getModel(); + this.normalMatrix = matrixStack.peek().getNormal(); this.seed = seed; this.overlay = overlay; diff --git a/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ItemRenderContext.java b/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ItemRenderContext.java index f63477e91..2295ee3a5 100644 --- a/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ItemRenderContext.java +++ b/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ItemRenderContext.java @@ -90,8 +90,8 @@ public class ItemRenderContext extends AbstractRenderContext implements RenderCo this.itemStack = stack; this.bufferBuilder = buffer; this.matrixStack = matrixStack; - this.matrix = matrixStack.method_23760().method_23761(); - this.normalMatrix = matrixStack.method_23760().method_23762(); + this.matrix = matrixStack.peek().getModel(); + this.normalMatrix = matrixStack.peek().getNormal(); this.overlay = overlay; this.vanillaHandler = vanillaHandler; diff --git a/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/TerrainRenderContext.java b/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/TerrainRenderContext.java index ae06c4e39..8b5c4aea9 100644 --- a/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/TerrainRenderContext.java +++ b/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/TerrainRenderContext.java @@ -96,8 +96,8 @@ public class TerrainRenderContext extends AbstractRenderContext implements Rende /** Called from chunk renderer hook. */ public boolean tesselateBlock(BlockState blockState, BlockPos blockPos, final BakedModel model, MatrixStack matrixStack) { - this.matrix = matrixStack.method_23760().method_23761(); - this.normalMatrix = matrixStack.method_23760().method_23762(); + this.matrix = matrixStack.peek().getModel(); + this.normalMatrix = matrixStack.peek().getNormal(); try { aoCalc.clear();