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 index 1916aa7d966..02a16c80e83 100644 --- 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 @@ -41,6 +41,7 @@ } ], "textures": { + "particle": "#side", "side": "gtceu:block/pipe/pipe_duct_side" } } \ No newline at end of file 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 index b5f34317735..2226641a443 100644 --- 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 @@ -43,6 +43,7 @@ ], "textures": { "end": "gtceu:block/pipe/pipe_duct_in", + "particle": "#side", "side": "gtceu:block/pipe/pipe_duct_side" } } \ No newline at end of file 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 index 39b3a894eac..a55cb442878 100644 --- 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 @@ -41,6 +41,7 @@ } ], "textures": { + "particle": "#side", "side": "gtceu:block/pipe/pipe_duct_side" } } \ No newline at end of file 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 index e5504c54c2b..99be7317456 100644 --- 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 @@ -43,6 +43,7 @@ ], "textures": { "end": "gtceu:block/pipe/pipe_duct_in", + "particle": "#side", "side": "gtceu:block/pipe/pipe_duct_side" } } \ No newline at end of file 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 index 1c7b6fe9ce9..2d0b6ace2aa 100644 --- 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 @@ -41,6 +41,7 @@ } ], "textures": { + "particle": "#side", "side": "gtceu:block/pipe/pipe_duct_side" } } \ No newline at end of file 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 index c004f0de717..0204502f18f 100644 --- 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 @@ -43,6 +43,7 @@ ], "textures": { "end": "gtceu:block/pipe/pipe_duct_in", + "particle": "#side", "side": "gtceu:block/pipe/pipe_duct_side" } } \ No newline at end of file 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 index 9de7a83201f..d42a077b7d3 100644 --- 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 @@ -79,6 +79,7 @@ } ], "textures": { + "particle": "#side", "side": "gtceu:block/pipe/pipe_laser_side", "side_overlay": "gtceu:block/pipe/pipe_laser_side_overlay" } 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 index 088aa774a9f..4415d9932a9 100644 --- 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 @@ -109,6 +109,7 @@ } ], "textures": { + "particle": "#side", "side": "gtceu:block/pipe/pipe_laser_side", "side_overlay": "gtceu:block/pipe/pipe_laser_side_overlay_emissive" } 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 index 7dc25d11fdd..ca2bd68f7d2 100644 --- 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 @@ -73,6 +73,7 @@ ], "textures": { "end": "gtceu:block/pipe/pipe_laser_in", + "particle": "#side", "side": "gtceu:block/pipe/pipe_laser_side", "side_overlay": "gtceu:block/pipe/pipe_laser_side_overlay" } 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 index 83cb7127326..a589a8af80f 100644 --- 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 @@ -93,6 +93,7 @@ ], "textures": { "end": "gtceu:block/pipe/pipe_laser_in", + "particle": "#side", "side": "gtceu:block/pipe/pipe_laser_side", "side_overlay": "gtceu:block/pipe/pipe_laser_side_overlay_emissive" } 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 index 1c46b15f85c..7ce8bf8c21a 100644 --- 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 @@ -79,6 +79,7 @@ } ], "textures": { + "particle": "#side", "side": "gtceu:block/pipe/pipe_optical_side", "side_overlay": "gtceu:block/pipe/pipe_optical_side_overlay" } 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 index 3a643f6dcc4..552b717cf3e 100644 --- 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 @@ -109,6 +109,7 @@ } ], "textures": { + "particle": "#side", "side": "gtceu:block/pipe/pipe_optical_side", "side_overlay": "gtceu:block/pipe/pipe_optical_side_overlay_active" } 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 index b7ee34bd7f4..4c0b091c60a 100644 --- 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 @@ -73,6 +73,7 @@ ], "textures": { "end": "gtceu:block/pipe/pipe_optical_in", + "particle": "#side", "side": "gtceu:block/pipe/pipe_optical_side", "side_overlay": "gtceu:block/pipe/pipe_optical_side_overlay" } 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 index 962efa95cf6..ec0d096c1a0 100644 --- 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 @@ -93,6 +93,7 @@ ], "textures": { "end": "gtceu:block/pipe/pipe_optical_in", + "particle": "#side", "side": "gtceu:block/pipe/pipe_optical_side", "side_overlay": "gtceu:block/pipe/pipe_optical_side_overlay_active" } 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 index cf2698d2453..73b8cd699db 100644 --- 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 @@ -41,6 +41,7 @@ } ], "textures": { + "particle": "#side", "side": "gtceu:block/pipe/pipe_duct_side" } } \ No newline at end of file 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 index 569180a1fba..c6d3c85d4b0 100644 --- 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 @@ -43,6 +43,7 @@ ], "textures": { "end": "gtceu:block/pipe/pipe_duct_in", + "particle": "#side", "side": "gtceu:block/pipe/pipe_duct_side" } } \ No newline at end of file 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 index 4213be34926..74da42c293b 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/ActivablePipeModel.java +++ b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/ActivablePipeModel.java @@ -139,7 +139,8 @@ protected BlockModelBuilder makeActiveElementModel(ResourceLocation name, @Nulla Reference2FloatMap faceEndpoints = makeFaceEndpointMap(x1, y1, z1, x2, y2, z2); BlockModelBuilder model = this.provider.models().getBuilder(name.toString()) - .parent(new ModelFile.UncheckedModelFile("block/block")); + .parent(new ModelFile.UncheckedModelFile("block/block")) + .texture("particle", "#" + (this.side != null ? SIDE_KEY : END_KEY)); 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/PipeModel.java b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/PipeModel.java index 3fa772c5756..68cbe9f0e22 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/PipeModel.java +++ b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/PipeModel.java @@ -313,7 +313,8 @@ protected BlockModelBuilder makeElementModel(ResourceLocation name, @Nullable Di Reference2FloatMap faceEndpoints = makeFaceEndpointMap(x1, y1, z1, x2, y2, z2); BlockModelBuilder model = this.provider.models().getBuilder(name.toString()) - .parent(new ModelFile.UncheckedModelFile("block/block")); + .parent(new ModelFile.UncheckedModelFile("block/block")) + .texture("particle", "#" + (this.side != null ? SIDE_KEY : END_KEY)); 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,