fixed normal size pipe models

GregTech-Intergalactical · Jan 6, 2025 · 68e57d7 · 68e57d7
1 parent 4edddd8
commit 68e57d7
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 45 deletions.
diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/normal/all.json b/common/src/main/resources/assets/antimatter/models/block/pipe/normal/all.json
@@ -8,9 +8,9 @@
 			"from": [4, 4, 0],
 			"to": [12, 12, 16],
 			"faces": {
-				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [0, 4, 16, 12], "texture": "#all", "tintindex": 0},
-				"south": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"south": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [0, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [4, 0, 12, 16], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [4, 0, 12, 16], "texture": "#all", "tintindex": 0}
@@ -21,7 +21,7 @@
 			"to": [16, 12, 12],
 			"faces": {
 				"north": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0}
@@ -33,7 +33,7 @@
 			"faces": {
 				"north": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
-				"west": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"west": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0}
 			}
@@ -46,7 +46,7 @@
 				"east": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
-				"up": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1}
+				"up": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0}
 			}
 		},
 		{
@@ -57,8 +57,50 @@
 				"east": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
-				"down": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1}
+				"down": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0}
 			}
-		}
+		},
+    {
+      "from": [5, -0.01, 5],
+      "to": [11, -0.01, 11],
+      "faces": {
+        "down": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [5, 16.01, 5],
+      "to": [11, 16.01, 11],
+      "faces": {
+        "up": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [5, 5, -0.01],
+      "to": [11, 11, -0.01],
+      "faces": {
+        "north": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [5, 5, 16.01],
+      "to": [11, 11, 16.01],
+      "faces": {
+        "south": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [16.01, 5, 5],
+      "to": [16.01, 11, 11],
+      "faces": {
+        "east": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [-0.01, 5, 5],
+      "to": [-0.01, 11, 11],
+      "faces": {
+        "west": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    }
 	]
 }
diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/normal/arrow.json b/common/src/main/resources/assets/antimatter/models/block/pipe/normal/arrow.json
@@ -9,9 +9,9 @@
 			"to": [16, 12, 12],
 			"faces": {
 				"north": {"uv": [0, 4, 16, 12], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 4, 16, 12], "texture": "#all", "tintindex": 0},
-				"west": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"west": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [0, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [0, 4, 16, 12], "texture": "#all", "tintindex": 0}
 			}
@@ -20,7 +20,7 @@
 			"from": [4, 4, 0],
 			"to": [12, 12, 4],
 			"faces": {
-				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
@@ -35,8 +35,36 @@
 				"east": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
-				"up": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1}
+				"up": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0}
 			}
-		}
+		},
+    {
+      "from": [5, 16.01, 5],
+      "to": [11, 16.01, 11],
+      "faces": {
+        "up": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [5, 5, -0.01],
+      "to": [11, 11, -0.01],
+      "faces": {
+        "north": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [16.01, 5, 5],
+      "to": [16.01, 11, 11],
+      "faces": {
+        "east": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [-0.01, 5, 5],
+      "to": [-0.01, 11, 11],
+      "faces": {
+        "west": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    }
 	]
 }
diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/normal/corner.json b/common/src/main/resources/assets/antimatter/models/block/pipe/normal/corner.json
@@ -8,7 +8,7 @@
 			"from": [4, 4, 0],
 			"to": [12, 12, 12],
 			"faces": {
-				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [4, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [0, 4, 12, 12], "texture": "#all", "tintindex": 0},
@@ -21,7 +21,7 @@
 			"to": [16, 12, 12],
 			"faces": {
 				"north": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0}
@@ -35,8 +35,29 @@
 				"east": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
-				"up": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1}
+				"up": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0}
 			}
-		}
-	]
+		},
+    {
+      "from": [5, 16.01, 5],
+      "to": [11, 16.01, 11],
+      "faces": {
+        "up": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [5, 5, -0.01],
+      "to": [11, 11, -0.01],
+      "faces": {
+        "north": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [16.01, 5, 5],
+      "to": [16.01, 11, 11],
+      "faces": {
+        "east": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    }
+  ]
 }
diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/normal/cross.json b/common/src/main/resources/assets/antimatter/models/block/pipe/normal/cross.json
@@ -8,9 +8,9 @@
 			"from": [4, 4, 0],
 			"to": [12, 12, 16],
 			"faces": {
-				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [0, 4, 16, 12], "texture": "#all", "tintindex": 0},
-				"south": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"south": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [0, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [4, 0, 12, 16], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [4, 0, 12, 16], "texture": "#all", "tintindex": 0}
@@ -21,7 +21,7 @@
 			"to": [16, 12, 12],
 			"faces": {
 				"north": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0}
@@ -33,10 +33,38 @@
 			"faces": {
 				"north": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
-				"west": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"west": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0}
 			}
-		}
+		},
+    {
+      "from": [5, 5, -0.01],
+      "to": [11, 11, -0.01],
+      "faces": {
+        "north": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [5, 5, 16.01],
+      "to": [11, 11, 16.01],
+      "faces": {
+        "south": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [16.01, 5, 5],
+      "to": [16.01, 11, 11],
+      "faces": {
+        "east": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [-0.01, 5, 5],
+      "to": [-0.01, 11, 11],
+      "faces": {
+        "west": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    }
 	]
 }
diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/normal/elbow.json b/common/src/main/resources/assets/antimatter/models/block/pipe/normal/elbow.json
@@ -8,7 +8,7 @@
 			"from": [4, 4, 0],
 			"to": [12, 12, 12],
 			"faces": {
-				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [4, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [0, 4, 12, 12], "texture": "#all", "tintindex": 0},
@@ -21,11 +21,25 @@
 			"to": [16, 12, 12],
 			"faces": {
 				"north": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0}
 			}
-		}
-	]
+		},
+    {
+      "from": [5, 5, -0.01],
+      "to": [11, 11, -0.01],
+      "faces": {
+        "north": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [16.01, 5, 5],
+      "to": [16.01, 11, 11],
+      "faces": {
+        "east": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    }
+  ]
 }
diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/normal/five.json b/common/src/main/resources/assets/antimatter/models/block/pipe/normal/five.json
@@ -8,9 +8,9 @@
 			"from": [4, 4, 0],
 			"to": [12, 12, 16],
 			"faces": {
-				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [0, 4, 16, 12], "texture": "#all", "tintindex": 0},
-				"south": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"south": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [0, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [4, 0, 12, 16], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [4, 0, 12, 16], "texture": "#all", "tintindex": 0}
@@ -21,7 +21,7 @@
 			"to": [16, 12, 12],
 			"faces": {
 				"north": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0}
@@ -34,7 +34,7 @@
 			"faces": {
 				"north": {"uv": [12, 4, 16, 12], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
-				"west": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1},
+				"west": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [0, 4, 4, 12], "texture": "#all", "tintindex": 0}
 			}
@@ -48,8 +48,43 @@
 				"east": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [4, 0, 12, 4], "texture": "#all", "tintindex": 0},
-				"up": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 1}
+				"up": {"uv": [4, 4, 12, 12], "texture": "#all", "tintindex": 0}
 			}
-		}
+		},
+    {
+      "from": [5, 16.01, 5],
+      "to": [11, 16.01, 11],
+      "faces": {
+        "up": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [5, 5, -0.01],
+      "to": [11, 11, -0.01],
+      "faces": {
+        "north": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [5, 5, 16.01],
+      "to": [11, 11, 16.01],
+      "faces": {
+        "south": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [16.01, 5, 5],
+      "to": [16.01, 11, 11],
+      "faces": {
+        "east": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [-0.01, 5, 5],
+      "to": [-0.01, 11, 11],
+      "faces": {
+        "west": {"uv": [5, 5, 11, 11], "texture": "#overlay", "tintindex": 1}
+      }
+    }
 	]
 }