Fix pipes' block break animation being the wrong shape (#4543)

screret · web-flow · commit 032470fb96cf · 2026-02-04T16:59:22.000-05:00
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/huge_duct_pipe/center.json b/src/generated/resources/assets/gtceu/models/block/pipe/huge_duct_pipe/center.json
@@ -40,6 +40,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "particle": "#side",
     "side": "gtceu:block/pipe/pipe_duct_side"
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/huge_duct_pipe/connection.json b/src/generated/resources/assets/gtceu/models/block/pipe/huge_duct_pipe/connection.json
@@ -41,6 +41,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "end": "gtceu:block/pipe/pipe_duct_in",
     "particle": "#side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/large_duct_pipe/center.json b/src/generated/resources/assets/gtceu/models/block/pipe/large_duct_pipe/center.json
@@ -40,6 +40,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "particle": "#side",
     "side": "gtceu:block/pipe/pipe_duct_side"
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/large_duct_pipe/connection.json b/src/generated/resources/assets/gtceu/models/block/pipe/large_duct_pipe/connection.json
@@ -41,6 +41,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "end": "gtceu:block/pipe/pipe_duct_in",
     "particle": "#side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/normal_duct_pipe/center.json b/src/generated/resources/assets/gtceu/models/block/pipe/normal_duct_pipe/center.json
@@ -40,6 +40,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "particle": "#side",
     "side": "gtceu:block/pipe/pipe_duct_side"
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/normal_duct_pipe/connection.json b/src/generated/resources/assets/gtceu/models/block/pipe/normal_duct_pipe/connection.json
@@ -41,6 +41,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "end": "gtceu:block/pipe/pipe_duct_in",
     "particle": "#side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/normal_laser_pipe/center.json b/src/generated/resources/assets/gtceu/models/block/pipe/normal_laser_pipe/center.json
@@ -78,6 +78,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "particle": "#side",
     "side": "gtceu:block/pipe/pipe_laser_side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/normal_laser_pipe/center_active.json b/src/generated/resources/assets/gtceu/models/block/pipe/normal_laser_pipe/center_active.json
@@ -108,6 +108,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "particle": "#side",
     "side": "gtceu:block/pipe/pipe_laser_side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/normal_laser_pipe/connection.json b/src/generated/resources/assets/gtceu/models/block/pipe/normal_laser_pipe/connection.json
@@ -71,6 +71,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "end": "gtceu:block/pipe/pipe_laser_in",
     "particle": "#side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/normal_laser_pipe/connection_active.json b/src/generated/resources/assets/gtceu/models/block/pipe/normal_laser_pipe/connection_active.json
@@ -91,6 +91,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "end": "gtceu:block/pipe/pipe_laser_in",
     "particle": "#side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/normal_optical_pipe/center.json b/src/generated/resources/assets/gtceu/models/block/pipe/normal_optical_pipe/center.json
@@ -78,6 +78,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "particle": "#side",
     "side": "gtceu:block/pipe/pipe_optical_side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/normal_optical_pipe/center_active.json b/src/generated/resources/assets/gtceu/models/block/pipe/normal_optical_pipe/center_active.json
@@ -108,6 +108,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "particle": "#side",
     "side": "gtceu:block/pipe/pipe_optical_side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/normal_optical_pipe/connection.json b/src/generated/resources/assets/gtceu/models/block/pipe/normal_optical_pipe/connection.json
@@ -71,6 +71,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "end": "gtceu:block/pipe/pipe_optical_in",
     "particle": "#side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/normal_optical_pipe/connection_active.json b/src/generated/resources/assets/gtceu/models/block/pipe/normal_optical_pipe/connection_active.json
@@ -91,6 +91,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "end": "gtceu:block/pipe/pipe_optical_in",
     "particle": "#side",
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/small_duct_pipe/center.json b/src/generated/resources/assets/gtceu/models/block/pipe/small_duct_pipe/center.json
@@ -40,6 +40,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "particle": "#side",
     "side": "gtceu:block/pipe/pipe_duct_side"
diff --git a/src/generated/resources/assets/gtceu/models/block/pipe/small_duct_pipe/connection.json b/src/generated/resources/assets/gtceu/models/block/pipe/small_duct_pipe/connection.json
@@ -41,6 +41,7 @@
       ]
     }
   ],
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "end": "gtceu:block/pipe/pipe_duct_in",
     "particle": "#side",
diff --git a/src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java
@@ -250,8 +250,8 @@ public int getVisualConnections() {
 
     @Override
     public void setConnection(Direction side, boolean connected, boolean fromNeighbor) {
-        // fix desync between two connections. Can happen if a pipe side is blocked, and a new pipe is placed next to
-        // it.
+        // fix desync between two connections.
+        // Can happen if a pipe side is blocked, and a new pipe is placed next to it.
         if (!getLevel().isClientSide) {
             if (isConnected(side) == connected) {
                 return;
diff --git a/src/main/java/com/gregtechceu/gtceu/api/pipenet/IPipeNode.java b/src/main/java/com/gregtechceu/gtceu/api/pipenet/IPipeNode.java
@@ -7,19 +7,24 @@
 import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity;
 import com.gregtechceu.gtceu.api.capability.ICoverable;
 import com.gregtechceu.gtceu.api.data.chemical.material.Material;
+import com.gregtechceu.gtceu.client.model.GTModelProperties;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraftforge.client.model.data.ModelData;
+import net.minecraftforge.client.model.data.ModelDataManager;
+import net.minecraftforge.common.extensions.IForgeBlockEntity;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public interface IPipeNode<PipeType extends Enum<PipeType> & IPipeType<NodeDataType>, NodeDataType>
-                          extends ITickSubscription, IPaintable {
+                          extends ITickSubscription, IPaintable, IForgeBlockEntity {
 
     long getOffsetTimer();
 
@@ -140,12 +145,19 @@ default NodeDataType getNodeData() {
 
     void notifyBlockUpdate();
 
+    @SuppressWarnings("UnstableApiUsage")
     default void scheduleRenderUpdate() {
         var pos = getPipePos();
         var level = getPipeLevel();
         if (level != null) {
             var state = level.getBlockState(pos);
             if (level.isClientSide) {
+                // simplified from requestModelDataUpdate
+                ModelDataManager manager = level.getModelDataManager();
+                if (manager != null) {
+                    manager.requestRefresh(self());
+                }
+
                 level.sendBlockUpdated(pos, state, state, Block.UPDATE_IMMEDIATE);
             } else {
                 level.blockEvent(pos, state.getBlock(), 1, 0);
@@ -176,4 +188,15 @@ default int getDefaultPaintingColor() {
 
     @NotNull
     Material getFrameMaterial();
+
+    @ApiStatus.Internal
+    @Override
+    default @NotNull ModelData getModelData() {
+        return ModelData.builder()
+                .with(GTModelProperties.LEVEL, self().getLevel())
+                .with(GTModelProperties.POS, self().getBlockPos())
+                .with(GTModelProperties.PIPE_CONNECTION_MASK, this.getVisualConnections())
+                .with(GTModelProperties.PIPE_BLOCKED_MASK, this.getBlockedConnections())
+                .build();
+    }
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/GTModelProperties.java b/src/main/java/com/gregtechceu/gtceu/client/model/GTModelProperties.java
@@ -11,6 +11,4 @@ public class GTModelProperties {
 
     public static final ModelProperty<Integer> PIPE_CONNECTION_MASK = new ModelProperty<>();
     public static final ModelProperty<Integer> PIPE_BLOCKED_MASK = new ModelProperty<>();
-
-    public static final ModelProperty<Boolean> PIPE_ACTIVE = new ModelProperty<>();
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/ActivablePipeModel.java b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/ActivablePipeModel.java
@@ -58,7 +58,7 @@ public void initModels() {
     }
 
     /**
-     * Override this to change the actual model {@link #block this.block} will use.
+     * Override this to change the active model {@link #block this.block} will use.
      *
      * @return A model builder for the block's actual model.
      * @see #getOrCreateBlockModel()
@@ -140,7 +140,8 @@ protected BlockModelBuilder makeActiveElementModel(ResourceLocation name, @Nulla
 
         BlockModelBuilder model = this.provider.models().getBuilder(name.toString())
                 .parent(new ModelFile.UncheckedModelFile("block/block"))
-                .texture("particle", "#" + (this.side != null ? SIDE_KEY : END_KEY));
+                .texture("particle", "#" + (this.side != null ? SIDE_KEY : END_KEY))
+                .renderType(RENDERTYPE_CUTOUT_MIPPED);
 
         ResourceLocation side = this.sideActive != null ? this.sideActive : this.side;
         ResourceLocation end = this.endActive != null ? this.endActive : this.end;
diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/BakedPipeModel.java b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/BakedPipeModel.java
@@ -58,22 +58,34 @@ public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction
         Integer connectionMask = modelData.get(GTModelProperties.PIPE_CONNECTION_MASK);
         Integer blockedMask = modelData.get(GTModelProperties.PIPE_BLOCKED_MASK);
 
-        if (level == null || pos == null || state == null) {
+        if (state == null) {
             connectionMask = ITEM_CONNECTIONS;
             blockedMask = Node.ALL_CLOSED;
         }
         if (connectionMask == null || connectionMask != Node.ALL_OPENED) {
-            quads.addAll(parts.get(null).getQuads(state, side, rand, modelData, renderType));
+            BakedModel centerModel = parts.get(null);
+            if (renderType == null ||
+                    state != null && centerModel.getRenderTypes(state, rand, modelData).contains(renderType)) {
+                quads.addAll(centerModel.getQuads(state, side, rand, modelData, renderType));
+            }
             if (connectionMask == null) {
                 // return unconnected base model if the model property isn't set
                 return quads;
             }
         }
         for (Direction dir : GTUtil.DIRECTIONS) {
             if (PipeBlockEntity.isConnected(connectionMask, dir)) {
-                quads.addAll(parts.get(dir).getQuads(state, side, rand, modelData, renderType));
+                BakedModel model = parts.get(dir);
+                if (renderType == null ||
+                        (state != null && model.getRenderTypes(state, rand, modelData).contains(renderType))) {
+                    quads.addAll(model.getQuads(state, side, rand, modelData, renderType));
+                }
                 if (blockedMask != null && PipeBlockEntity.isFaceBlocked(blockedMask, dir)) {
-                    quads.addAll(restrictors.get(dir).getQuads(state, side, rand, modelData, renderType));
+                    model = restrictors.get(dir);
+                    if (renderType == null ||
+                            (state != null && model.getRenderTypes(state, rand, modelData).contains(renderType))) {
+                        quads.addAll(model.getQuads(state, side, rand, modelData, renderType));
+                    }
                 }
             }
         }
@@ -83,7 +95,7 @@ public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction
         ICoverableRenderer.super.renderCovers(quads, pipeNode.getCoverContainer(), pos, level, side, rand,
                 modelData, renderType);
 
-        if (pipeNode.getFrameMaterial().isNull() || (renderType != null && renderType != RenderType.translucent())) {
+        if (pipeNode.getFrameMaterial().isNull()) {
             return quads;
         }
         var frameBlockEntry = GTMaterialBlocks.MATERIAL_BLOCKS.get(TagPrefix.frameGt, pipeNode.getFrameMaterial());
@@ -123,16 +135,13 @@ public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction
 
     @Override
     public ModelData getModelData(BlockAndTintGetter level, BlockPos pos, BlockState state, ModelData modelData) {
-        ModelData.Builder builder = modelData.derive()
-                .with(GTModelProperties.LEVEL, level)
-                .with(GTModelProperties.POS, pos);
-
-        if (!(level.getBlockEntity(pos) instanceof PipeBlockEntity<?, ?> blockEntity)) {
-            return builder.build();
+        for (BakedModel part : this.parts.values()) {
+            modelData = part.getModelData(level, pos, state, modelData);
+        }
+        for (BakedModel restrictor : this.restrictors.values()) {
+            modelData = restrictor.getModelData(level, pos, state, modelData);
         }
-        return builder.with(GTModelProperties.PIPE_CONNECTION_MASK, blockEntity.getVisualConnections())
-                .with(GTModelProperties.PIPE_BLOCKED_MASK, blockEntity.getBlockedConnections())
-                .build();
+        return modelData;
     }
 
     @SuppressWarnings("deprecation")
diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/PipeModel.java b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/PipeModel.java
@@ -88,6 +88,7 @@ public class PipeModel {
             SIDE_OVERLAY_KEY   = "side_overlay",
             END_OVERLAY_KEY    = "end_overlay";
     // spotless:on
+    protected static final ResourceLocation RENDERTYPE_CUTOUT_MIPPED = new ResourceLocation("cutout_mipped");
 
     public static final Set<PipeModel> DYNAMIC_MODELS = new HashSet<>();
 
@@ -98,7 +99,7 @@ public static void initDynamicModels() {
     }
 
     @Getter
-    private final PipeBlock<?, ?, ?> block;
+    protected final PipeBlock<?, ?, ?> block;
     public final @NotNull ResourceLocation blockId;
     protected final GTBlockstateProvider provider;
 
@@ -314,7 +315,8 @@ protected BlockModelBuilder makeElementModel(ResourceLocation name, @Nullable Di
 
         BlockModelBuilder model = this.provider.models().getBuilder(name.toString())
                 .parent(new ModelFile.UncheckedModelFile("block/block"))
-                .texture("particle", "#" + (this.side != null ? SIDE_KEY : END_KEY));
+                .texture("particle", "#" + (this.side != null ? SIDE_KEY : END_KEY))
+                .renderType(RENDERTYPE_CUTOUT_MIPPED);
         makePartModelElement(model, endFace, false, faceEndpoints, 0.0f, 0, 1,
                 x1, y1, z1, x2, y2, z2, this.side, this.end, SIDE_KEY, END_KEY);
         makePartModelElement(model, endFace, true, faceEndpoints, 0.001f, 0, 1,

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`]`
`41`	`41`	`}`
`42`	`42`	`],`
	`43`	`+ "render_type": "minecraft:cutout_mipped",`
`43`	`44`	`"textures": {`
`44`	`45`	`"particle": "#side",`
`45`	`46`	`"side": "gtceu:block/pipe/pipe_duct_side"`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`]`
`42`	`42`	`}`
`43`	`43`	`],`
	`44`	`+ "render_type": "minecraft:cutout_mipped",`
`44`	`45`	`"textures": {`
`45`	`46`	`"end": "gtceu:block/pipe/pipe_duct_in",`
`46`	`47`	`"particle": "#side",`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@`
`78`	`78`	`]`
`79`	`79`	`}`
`80`	`80`	`],`
	`81`	`+ "render_type": "minecraft:cutout_mipped",`
`81`	`82`	`"textures": {`
`82`	`83`	`"particle": "#side",`
`83`	`84`	`"side": "gtceu:block/pipe/pipe_laser_side",`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@`
`108`	`108`	`]`
`109`	`109`	`}`
`110`	`110`	`],`
	`111`	`+ "render_type": "minecraft:cutout_mipped",`
`111`	`112`	`"textures": {`
`112`	`113`	`"particle": "#side",`
`113`	`114`	`"side": "gtceu:block/pipe/pipe_laser_side",`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@`
`71`	`71`	`]`
`72`	`72`	`}`
`73`	`73`	`],`
	`74`	`+ "render_type": "minecraft:cutout_mipped",`
`74`	`75`	`"textures": {`
`75`	`76`	`"end": "gtceu:block/pipe/pipe_laser_in",`
`76`	`77`	`"particle": "#side",`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@`
`91`	`91`	`]`
`92`	`92`	`}`
`93`	`93`	`],`
	`94`	`+ "render_type": "minecraft:cutout_mipped",`
`94`	`95`	`"textures": {`
`95`	`96`	`"end": "gtceu:block/pipe/pipe_laser_in",`
`96`	`97`	`"particle": "#side",`