dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renames

Browse Source
This commit is contained in:
raoulvdberge
2017-06-13 12:02:11 +02:00
parent 9a6d009695
commit 34578d5525
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -1,7 +1,7 @@
# Refined Storage Changelog # Refined Storage Changelog
### 1.4.13 ### 1.4.13
- Fixed Portable Grid model (raoulvdberge) - Fixed Portable Grid model (raoulvdberge, CyanideX)
### 1.4.12 ### 1.4.12
- Updated Forge to 2315 (raoulvdberge) - Updated Forge to 2315 (raoulvdberge)

2
src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
View File

@@ -594,7 +594,7 @@ public final class RSUtils {
tessellator.draw(); 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 // From ForgeBlockStateV1
private static final TRSRTransformation FLIP_X = new TRSRTransformation(null, null, new Vector3f(-1, 1, 1), null); private static final TRSRTransformation FLIP_X = new TRSRTransformation(null, null, new Vector3f(-1, 1, 1), null);

2
src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPattern.java
View File

@@ -34,7 +34,7 @@ public class BakedModelPattern implements IBakedModel, IPerspectiveAwareModel {
public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
TRSRTransformation transform = RSUtils.getDefaultItemTransforms().get(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 @Override

2
src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPortableGrid.java
View File

@@ -27,7 +27,7 @@ public class BakedModelPortableGrid implements IPerspectiveAwareModel {
public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
TRSRTransformation transform = RSUtils.getDefaultBlockTransforms().get(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 @Override