fixed tiny models

GT-Reimagined · Jan 1, 2025 · 989f403 · 989f403
1 parent 552c096
commit 989f403
Show file tree

Hide file tree

Showing 11 changed files with 260 additions and 49 deletions.
diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/all.json b/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/all.json
@@ -1,4 +1,5 @@
 {
+	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
 		"particle": "#all"
@@ -8,9 +9,9 @@
 			"from": [6, 6, 0],
 			"to": [10, 10, 16],
 			"faces": {
-				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [0, 6, 16, 10], "texture": "#all", "tintindex": 0},
-				"south": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"south": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [0, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [6, 0, 10, 16], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [6, 0, 10, 16], "texture": "#all", "tintindex": 0}
@@ -21,7 +22,7 @@
 			"to": [16, 10, 10],
 			"faces": {
 				"north": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0}
@@ -33,7 +34,7 @@
 			"faces": {
 				"north": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0},
-				"west": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"west": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0}
 			}
@@ -46,7 +47,7 @@
 				"east": {"uv": [6, 0, 10, 6], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [6, 0, 10, 6], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [6, 0, 10, 6], "texture": "#all", "tintindex": 0},
-				"up": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1}
+				"up": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0}
 			}
 		},
 		{
@@ -57,7 +58,49 @@
 				"east": {"uv": [6, 0, 10, 6], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [6, 0, 10, 6], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [6, 0, 10, 6], "texture": "#all", "tintindex": 0},
-				"down": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1}
+				"down": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0}
+			}
+		},
+		{
+			"from": [7, -0.01, 7],
+			"to": [9, -0.01, 9],
+			"faces": {
+				"down": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+			}
+		},
+		{
+			"from": [7, 7, -0.01],
+			"to": [9, 9, -0.01],
+			"faces": {
+				"north": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+			}
+		},
+		{
+			"from": [7, 16.01, 7],
+			"to": [9, 16.01, 9],
+			"faces": {
+				"up": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+			}
+		},
+		{
+			"from": [7, 7, 16.01],
+			"to": [9, 9, 16.01],
+			"faces": {
+				"south": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+			}
+		},
+		{
+			"from": [16.01, 7, 7],
+			"to": [16.01, 9, 9],
+			"faces": {
+				"east": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+			}
+		},
+		{
+			"from": [-0.01, 7, 7],
+			"to": [-0.01, 9, 9],
+			"faces": {
+				"west": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
 			}
 		}
 	]

diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/arrow.json b/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/arrow.json
@@ -9,9 +9,9 @@
 			"to": [16, 10, 10],
 			"faces": {
 				"north": {"uv": [0, 6, 16, 10], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 6, 16, 10], "texture": "#all", "tintindex": 0},
-				"west": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"west": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [0, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [0, 6, 16, 10], "texture": "#all", "tintindex": 0}
 			}
@@ -20,7 +20,7 @@
 			"from": [6, 6, 0],
 			"to": [10, 10, 6],
 			"faces": {
-				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [6, 0, 10, 6], "texture": "#all", "tintindex": 0},
@@ -35,8 +35,36 @@
 				"east": {"uv": [6, 0, 10, 6], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [6, 0, 10, 6], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [6, 0, 10, 6], "texture": "#all", "tintindex": 0},
-				"up": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1}
+				"up": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0}
 			}
-		}
+		},
+    {
+      "from": [7, 7, -0.01],
+      "to": [9, 9, -0.01],
+      "faces": {
+        "north": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [7, 16.01, 7],
+      "to": [9, 16.01, 9],
+      "faces": {
+        "up": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [16.01, 7, 7],
+      "to": [16.01, 9, 9],
+      "faces": {
+        "east": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [-0.01, 7, 7],
+      "to": [-0.01, 9, 9],
+      "faces": {
+        "west": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    }
 	]
 }
diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/base.json b/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/base.json
@@ -8,12 +8,12 @@
 			"from": [6, 6, 6],
 			"to": [10, 10, 10],
 			"faces": {
-				"north": {"uv": [5, 5, 11, 11], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [5, 5, 11, 11], "texture": "#all", "tintindex": 0},
-				"south": {"uv": [5, 5, 11, 11], "texture": "#all", "tintindex": 0},
-				"west": {"uv": [5, 5, 11, 11], "texture": "#all", "tintindex": 0},
-				"up": {"uv": [5, 5, 11, 11], "texture": "#all", "tintindex": 0},
-				"down": {"uv": [5, 5, 11, 11], "texture": "#all", "tintindex": 0}
+				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
+				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
+				"south": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
+				"west": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
+				"up": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
+				"down": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0}
 			}
 		}
 	]

diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/corner.json b/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/corner.json
@@ -8,7 +8,7 @@
 			"from": [6, 6, 0],
 			"to": [10, 10, 10],
 			"faces": {
-				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [6, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [0, 6, 10, 10], "texture": "#all", "tintindex": 0},
@@ -21,7 +21,7 @@
 			"to": [16, 10, 10],
 			"faces": {
 				"north": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0}
@@ -35,8 +35,29 @@
 				"east": {"uv": [6, 10, 10, 16], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [6, 10, 10, 16], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [6, 10, 10, 16], "texture": "#all", "tintindex": 0},
-				"up": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1}
+				"up": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0}
 			}
-		}
-	]
+		},
+    {
+      "from": [7, 7, -0.01],
+      "to": [9, 9, -0.01],
+      "faces": {
+        "north": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [7, 16.01, 7],
+      "to": [9, 16.01, 9],
+      "faces": {
+        "up": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [16.01, 7, 7],
+      "to": [16.01, 9, 9],
+      "faces": {
+        "east": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    }
+  ]
 }
diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/cross.json b/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/cross.json
@@ -8,7 +8,7 @@
 			"from": [6, 6, 0],
 			"to": [10, 10, 16],
 			"faces": {
-				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [0, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [0, 6, 16, 10], "texture": "#all", "tintindex": 0},
@@ -21,7 +21,7 @@
 			"to": [16, 10, 10],
 			"faces": {
 				"north": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0}
@@ -33,10 +33,38 @@
 			"faces": {
 				"north": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0},
-				"west": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"west": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0}
 			}
-		}
+		},
+    {
+      "from": [7, 7, -0.01],
+      "to": [9, 9, -0.01],
+      "faces": {
+        "north": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [7, 7, 16.01],
+      "to": [9, 9, 16.01],
+      "faces": {
+        "south": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [16.01, 7, 7],
+      "to": [16.01, 9, 9],
+      "faces": {
+        "east": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [-0.01, 7, 7],
+      "to": [-0.01, 9, 9],
+      "faces": {
+        "west": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    }
 	]
 }
diff --git a/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/elbow.json b/common/src/main/resources/assets/antimatter/models/block/pipe/tiny/elbow.json
@@ -8,7 +8,7 @@
 			"from": [6, 6, 0],
 			"to": [10, 10, 10],
 			"faces": {
-				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"north": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"east": {"uv": [6, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"west": {"uv": [0, 6, 10, 10], "texture": "#all", "tintindex": 0},
@@ -21,11 +21,25 @@
 			"to": [16, 10, 10],
 			"faces": {
 				"north": {"uv": [0, 6, 6, 10], "texture": "#all", "tintindex": 0},
-				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 1},
+				"east": {"uv": [6, 6, 10, 10], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"up": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0},
 				"down": {"uv": [10, 6, 16, 10], "texture": "#all", "tintindex": 0}
 			}
-		}
-	]
+		},
+    {
+      "from": [7, 7, -0.01],
+      "to": [9, 9, -0.01],
+      "faces": {
+        "north": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    },
+    {
+      "from": [16.01, 7, 7],
+      "to": [16.01, 9, 9],
+      "faces": {
+        "east": {"uv": [7, 7, 9, 9], "texture": "#overlay", "tintindex": 1}
+      }
+    }
+  ]
 }