diff --git a/build.gradle b/build.gradle index 75febfc2f..a3c1a8794 100755 --- a/build.gradle +++ b/build.gradle @@ -82,7 +82,7 @@ task sourceJar(type: Jar, dependsOn: classes) { } minecraft { - mappings channel: 'snapshot', version: '20200205-1.15.1' + mappings channel: 'snapshot', version: '20200213-1.15.1' reobfMappings 'notch' runs { diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index a80322f7b..b4e5e3a62 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -111,8 +111,8 @@ public class GuiClick extends Screen implements Helper { } public void onRender(MatrixStack modelViewStack, MatrixStack projectionStack) { - this.projectionViewMatrix = projectionStack.getLast().getPositionMatrix().copy(); - this.projectionViewMatrix.multiply(modelViewStack.getLast().getPositionMatrix()); + this.projectionViewMatrix = projectionStack.getLast().getMatrix().copy(); + this.projectionViewMatrix.mul(modelViewStack.getLast().getMatrix()); this.projectionViewMatrix.invert(); if (currentMouseOver != null) { diff --git a/src/main/java/baritone/utils/IRenderer.java b/src/main/java/baritone/utils/IRenderer.java index f87db3df0..49aa976d2 100644 --- a/src/main/java/baritone/utils/IRenderer.java +++ b/src/main/java/baritone/utils/IRenderer.java @@ -77,7 +77,7 @@ public interface IRenderer { static void drawAABB(MatrixStack stack, AxisAlignedBB aabb) { AxisAlignedBB toDraw = aabb.offset(-renderManager.renderPosX(), -renderManager.renderPosY(), -renderManager.renderPosZ()); - Matrix4f matrix4f = stack.getLast().getPositionMatrix(); + Matrix4f matrix4f = stack.getLast().getMatrix(); buffer.begin(GL_LINES, DefaultVertexFormats.POSITION); // bottom buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.minZ).endVertex(); diff --git a/src/main/java/baritone/utils/PathRenderer.java b/src/main/java/baritone/utils/PathRenderer.java index bf05787b3..75d4f938a 100644 --- a/src/main/java/baritone/utils/PathRenderer.java +++ b/src/main/java/baritone/utils/PathRenderer.java @@ -181,7 +181,7 @@ public final class PathRenderer implements IRenderer, Helper { public static void drawLine(MatrixStack stack, double x1, double y1, double z1, double x2, double y2, double z2) { - Matrix4f matrix4f = stack.getLast().getPositionMatrix(); + Matrix4f matrix4f = stack.getLast().getMatrix(); double vpX = posX(); double vpY = posY(); @@ -319,7 +319,7 @@ public final class PathRenderer implements IRenderer, Helper { renderHorizontalQuad(stack, minX, maxX, minZ, maxZ, y1); renderHorizontalQuad(stack, minX, maxX, minZ, maxZ, y2); - Matrix4f matrix4f = stack.getLast().getPositionMatrix(); + Matrix4f matrix4f = stack.getLast().getMatrix(); buffer.begin(GL_LINES, DefaultVertexFormats.POSITION); buffer.pos(matrix4f, (float) minX, (float) minY, (float) minZ).endVertex(); buffer.pos(matrix4f, (float) minX, (float) maxY, (float) minZ).endVertex(); @@ -336,7 +336,7 @@ public final class PathRenderer implements IRenderer, Helper { private static void renderHorizontalQuad(MatrixStack stack, double minX, double maxX, double minZ, double maxZ, double y) { if (y != 0) { - Matrix4f matrix4f = stack.getLast().getPositionMatrix(); + Matrix4f matrix4f = stack.getLast().getMatrix(); buffer.begin(GL_LINE_LOOP, DefaultVertexFormats.POSITION); buffer.pos(matrix4f, (float) minX, (float) y, (float) minZ).endVertex(); buffer.pos(matrix4f, (float) maxX, (float) y, (float) minZ).endVertex();