fix swapped DynamicItemModel conditions

asiekierka · Feb 20, 2017 · f86ae4a · f86ae4a
1 parent 9e86777
commit f86ae4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/pl/asie/foamfix/client/Deduplicator.java b/src/main/java/pl/asie/foamfix/client/Deduplicator.java
@@ -94,7 +94,6 @@ public Deduplicator() {
         TRIM_ARRAYS_CLASSES.add(SimpleBakedModel.class);
         TRIM_ARRAYS_CLASSES.add(WeightedBakedModel.class);
 
-        BLACKLIST_CLASS.add(FoamyItemLayerModel.DynamicItemModel.class);
         BLACKLIST_CLASS.add(FoamyItemLayerModel.Dynamic3DItemModel.class);
 
         BLACKLIST_CLASS.add(Object.class);

diff --git a/src/main/java/pl/asie/foamfix/client/FoamyItemLayerModel.java b/src/main/java/pl/asie/foamfix/client/FoamyItemLayerModel.java
@@ -74,9 +74,11 @@ public Dynamic3DItemModel(DynamicItemModel parent) {
         @Override
         public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType type) {
             Pair<? extends IBakedModel, Matrix4f> pair = IPerspectiveAwareModel.MapWrapper.handlePerspective(this, parent.transforms, type);
-            if(type != ItemCameraTransforms.TransformType.GUI) {
-                return Pair.of(parent, pair.getRight());
+
+            if (type == ItemCameraTransforms.TransformType.GUI && pair.getRight() == null) {
+                return Pair.of(parent, null);
             }
+
             return pair;
         }
 
@@ -192,8 +194,8 @@ public ItemOverrideList getOverrides() {
         public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType type) {
             Pair<? extends IBakedModel, Matrix4f> pair = IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, type);
 
-            if (type == ItemCameraTransforms.TransformType.GUI && pair.getRight() == null) {
-                return Pair.of(otherModel, null);
+            if (type != ItemCameraTransforms.TransformType.GUI) {
+                return Pair.of(otherModel, pair.getRight());
             }
 
             return pair;