Fix Baked Item models with transformations (#5241)

src/main/java/net/minecraftforge/client/model/BakedItemModel.java

@@ -44,13 +44,20 @@ public class BakedItemModel implements IBakedModel
     protected final ItemOverrideList overrides;
     protected final IBakedModel guiModel;
 
+    /** @deprecated use {@link #BakedItemModel(ImmutableList, TextureAtlasSprite, ImmutableMap, ItemOverrideList, boolean)} */
+    @Deprecated // TODO: remove
     public BakedItemModel(ImmutableList<BakedQuad> quads, TextureAtlasSprite particle, ImmutableMap<TransformType, TRSRTransformation> transforms, ItemOverrideList overrides)
+    {
+        this(quads, particle, transforms, overrides, true);
+    }
+
+    public BakedItemModel(ImmutableList<BakedQuad> quads, TextureAtlasSprite particle, ImmutableMap<TransformType, TRSRTransformation> transforms, ItemOverrideList overrides, boolean untransformed)
     {
         this.quads = quads;
         this.particle = particle;
         this.transforms = transforms;
         this.overrides = overrides;
-        this.guiModel = hasGuiIdentity(transforms) ? new BakedGuiItemModel<>(this) : null;
+        this.guiModel = untransformed && hasGuiIdentity(transforms) ? new BakedGuiItemModel<>(this) : null;
     }
 
     private static boolean hasGuiIdentity(ImmutableMap<TransformType, TRSRTransformation> transforms)

src/main/java/net/minecraftforge/client/model/ItemLayerModel.java

@@ -110,6 +110,7 @@ public final class ItemLayerModel implements IModel
     {
         ImmutableList.Builder<BakedQuad> builder = ImmutableList.builder();
         Optional<TRSRTransformation> transform = state.apply(Optional.empty());
+        boolean identity = !transform.isPresent() || transform.get().isIdentity();
         for(int i = 0; i < textures.size(); i++)
         {
             TextureAtlasSprite sprite = bakedTextureGetter.apply(textures.get(i));
@@ -117,7 +118,7 @@ public final class ItemLayerModel implements IModel
         }
         TextureAtlasSprite particle = bakedTextureGetter.apply(textures.isEmpty() ? new ResourceLocation("missingno") : textures.get(0));
         ImmutableMap<TransformType, TRSRTransformation> map = PerspectiveMapWrapper.getTransforms(state);
-        return new BakedItemModel(builder.build(), particle, map, overrides);
+        return new BakedItemModel(builder.build(), particle, map, overrides, identity);
     }
 
     public static ImmutableList<BakedQuad> getQuadsForSprite(int tint, TextureAtlasSprite sprite, VertexFormat format, Optional<TRSRTransformation> transform)
@@ -407,12 +408,14 @@ public final class ItemLayerModel implements IModel
     private static void putVertex(UnpackedBakedQuad.Builder builder, VertexFormat format, Optional<TRSRTransformation> transform, EnumFacing side, float x, float y, float z, float u, float v)
     {
         Vector4f vec = new Vector4f();
+        boolean hasTransform = transform.isPresent() && !transform.get().isIdentity();
+
         for(int e = 0; e < format.getElementCount(); e++)
         {
             switch(format.getElement(e).getUsage())
             {
             case POSITION:
-                if(transform.isPresent())
+                if(hasTransform)
                 {
                     vec.x = x;
                     vec.y = y;

src/main/java/net/minecraftforge/client/model/ModelDynBucket.java

@@ -176,7 +176,7 @@ public final class ModelDynBucket implements IModel
             }
         }
 
-        return new BakedDynBucket(this, builder.build(), particleSprite, format, Maps.immutableEnumMap(transformMap), Maps.newHashMap());
+        return new BakedDynBucket(this, builder.build(), particleSprite, format, Maps.immutableEnumMap(transformMap), Maps.newHashMap(), transform.isIdentity());
     }
 
     /**
@@ -453,14 +453,15 @@ public final class ModelDynBucket implements IModel
         private final Map<String, IBakedModel> cache; // contains all the baked models since they'll never change
         private final VertexFormat format;
 
-        public BakedDynBucket(ModelDynBucket parent,
-                              ImmutableList<BakedQuad> quads,
-                              TextureAtlasSprite particle,
-                              VertexFormat format,
-                              ImmutableMap<TransformType, TRSRTransformation> transforms,
-                              Map<String, IBakedModel> cache)
+        BakedDynBucket(ModelDynBucket parent,
+                       ImmutableList<BakedQuad> quads,
+                       TextureAtlasSprite particle,
+                       VertexFormat format,
+                       ImmutableMap<TransformType, TRSRTransformation> transforms,
+                       Map<String, IBakedModel> cache,
+                       boolean untransformed)
         {
-            super(quads, particle, transforms, BakedDynBucketOverrideHandler.INSTANCE);
+            super(quads, particle, transforms, BakedDynBucketOverrideHandler.INSTANCE, untransformed);
             this.format = format;
             this.parent = parent;
             this.cache = cache;

src/main/java/net/minecraftforge/client/model/ModelLoader.java

@@ -439,7 +439,7 @@ public final class ModelLoader extends ModelBakery
             Map<TransformType, TRSRTransformation> tMap = Maps.newEnumMap(TransformType.class);
             tMap.putAll(PerspectiveMapWrapper.getTransforms(transforms));
             tMap.putAll(PerspectiveMapWrapper.getTransforms(state));
-            IModelState perState = new SimpleModelState(ImmutableMap.copyOf(tMap));
+            IModelState perState = new SimpleModelState(ImmutableMap.copyOf(tMap), state.apply(Optional.empty()));
 
             if(hasItemModel(model))
             {