diff --git a/CHANGELOG.md b/CHANGELOG.md index deab84755..7b3bcc450 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Refined Storage Changelog ### 1.4.13 -- Fixed Portable Grid model (raoulvdberge) +- Fixed Portable Grid model (raoulvdberge, CyanideX) ### 1.4.12 - Updated Forge to 2315 (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java index 3e36213eb..782c9559b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java @@ -594,7 +594,7 @@ public final class RSUtils { tessellator.draw(); } - public static final Matrix4f EMPTY_MATRIX = getTransform(0, 0, 0, 0, 0, 0, 1.0f).getMatrix(); + public static final Matrix4f EMPTY_MATRIX_TRANSFORM = getTransform(0, 0, 0, 0, 0, 0, 1.0f).getMatrix(); // From ForgeBlockStateV1 private static final TRSRTransformation FLIP_X = new TRSRTransformation(null, null, new Vector3f(-1, 1, 1), null); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPattern.java index a2a9cfe27..e7bc2a914 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPattern.java @@ -34,7 +34,7 @@ public class BakedModelPattern implements IBakedModel, IPerspectiveAwareModel { public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { TRSRTransformation transform = RSUtils.getDefaultItemTransforms().get(cameraTransformType); - return Pair.of(this, transform == null ? RSUtils.EMPTY_MATRIX : transform.getMatrix()); + return Pair.of(this, transform == null ? RSUtils.EMPTY_MATRIX_TRANSFORM : transform.getMatrix()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPortableGrid.java index 516876f6f..8487f9705 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPortableGrid.java @@ -27,7 +27,7 @@ public class BakedModelPortableGrid implements IPerspectiveAwareModel { public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { TRSRTransformation transform = RSUtils.getDefaultBlockTransforms().get(cameraTransformType); - return Pair.of(this, transform == null ? RSUtils.EMPTY_MATRIX : transform.getMatrix()); + return Pair.of(this, transform == null ? RSUtils.EMPTY_MATRIX_TRANSFORM : transform.getMatrix()); } @Override