diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.java.patch index 5ef8da470d..42fa751c5a 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.java.patch @@ -1,10 +1,11 @@ --- a/net/minecraft/client/renderer/block/model/ItemModelGenerator.java +++ b/net/minecraft/client/renderer/block/model/ItemModelGenerator.java -@@ -39,6 +_,7 @@ +@@ -39,6 +_,8 @@ map.put("particle", p_111672_.m_111477_("particle") ? Either.left(p_111672_.m_111480_("particle")) : map.get("layer0")); BlockModel blockmodel = new BlockModel((ResourceLocation)null, list, map, false, p_111672_.m_111479_(), p_111672_.m_111491_(), p_111672_.m_111484_()); blockmodel.f_111416_ = p_111672_.f_111416_; + blockmodel.customData.copyFrom(p_111672_.customData); ++ blockmodel.customData.setGui3d(false); return blockmodel; } diff --git a/src/main/java/net/minecraftforge/client/model/geometry/BlockGeometryBakingContext.java b/src/main/java/net/minecraftforge/client/model/geometry/BlockGeometryBakingContext.java index 37c003a537..cbc6a1fa9f 100644 --- a/src/main/java/net/minecraftforge/client/model/geometry/BlockGeometryBakingContext.java +++ b/src/main/java/net/minecraftforge/client/model/geometry/BlockGeometryBakingContext.java @@ -42,6 +42,7 @@ public class BlockGeometryBakingContext implements IGeometryBakingContext private Transformation rootTransform; @Nullable private ResourceLocation renderTypeHint; + private boolean gui3d = true; @ApiStatus.Internal public BlockGeometryBakingContext(BlockModel owner) @@ -94,7 +95,7 @@ public class BlockGeometryBakingContext implements IGeometryBakingContext @Override public boolean isGui3d() { - return true; + return gui3d; } @Override @@ -142,12 +143,18 @@ public class BlockGeometryBakingContext implements IGeometryBakingContext this.renderTypeHint = renderTypeHint; } + public void setGui3d(boolean gui3d) + { + this.gui3d = gui3d; + } + public void copyFrom(BlockGeometryBakingContext other) { this.customGeometry = other.customGeometry; this.rootTransform = other.rootTransform; this.visibilityData.copyFrom(other.visibilityData); this.renderTypeHint = other.renderTypeHint; + this.gui3d = other.gui3d; } public Collection getTextureDependencies(Function modelGetter, Set> missingTextureErrors)