fixed small pipe models

GregTech-Intergalactical · Jan 2, 2025 · 7c9bcce · 7c9bcce
1 parent 989f403
commit 7c9bcce
Show file tree

Hide file tree

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