Fix texture and model errors

bziemons · bziemons · commit 658ab38658a5 · 2021-05-05T01:05:17.000+02:00
Fix #1129
diff --git a/resources/assets/logisticspipes/blockstates/pipe.json b/resources/assets/logisticspipes/blockstates/pipe.json
@@ -1,5 +1,9 @@
 {
-	"variants": {
-		"normal": { "model": "logisticspipes:pipe" }
-	}
+  "variants": {
+    "normal": [
+      {
+        "model": "logisticspipes:pipe"
+      }
+    ]
+  }
 }
diff --git a/resources/assets/logisticspipes/blockstates/solid_block.json b/resources/assets/logisticspipes/blockstates/solid_block.json
@@ -1,10 +1,25 @@
 {
-	"forge_marker": 1,
-	"defaults": {
-		"custom": { "flip-v": true },
-		"model": "logisticspipes:solidblock.internal"
-	},
-	"variants": {
-		"normal": {}
-	}
+  "forge_marker": 1,
+  "defaults": {
+    "custom": {
+      "flip-v": true
+    },
+    "model": "logisticspipes:solid_block"
+  },
+  "variants": {
+    "block_sub_type": {
+      "0": {},
+      "1": {},
+      "2": {},
+      "3": {},
+      "4": {},
+      "5": {},
+      "6": {},
+      "7": {},
+      "8": {},
+      "9": {},
+      "10": {},
+      "11": {}
+    }
+  }
 }
diff --git a/resources/assets/logisticspipes/blockstates/sub_multiblock.json b/resources/assets/logisticspipes/blockstates/sub_multiblock.json
@@ -1,5 +1,9 @@
 {
-	"variants": {
-		"normal": { "model": "logisticspipes:sub_multiblock" }
-	}
+  "variants": {
+    "normal": [
+      {
+        "model": "logisticspipes:sub_multiblock"
+      }
+    ]
+  }
 }
diff --git a/resources/assets/logisticspipes/models/block/solid_block.json b/resources/assets/logisticspipes/models/block/solid_block.json
@@ -1,6 +1,6 @@
 {
-	"parent": "block/cube_all",
-	"textures": {
-		"all": "logisticspipes:blocks/solid_block"
-	}
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "logisticspipes:solid_block/frame"
+  }
 }
diff --git a/resources/assets/logisticspipes/models/item/upgrade/logic_controller.json b/resources/assets/logisticspipes/models/item/upgrade/logic_controller.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "minecraft:missingno"
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`{`
`2`		`- "variants": {`
`3`		`- "normal": { "model": "logisticspipes:pipe" }`
`4`		`- }`
	`2`	`+ "variants": {`
	`3`	`+ "normal": [`
	`4`	`+ {`
	`5`	`+ "model": "logisticspipes:pipe"`
	`6`	`+ }`
	`7`	`+ ]`
	`8`	`+ }`
`5`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "parent": "block/cube_all",`
`3`		`- "textures": {`
`4`		`- "all": "logisticspipes:blocks/solid_block"`
`5`		`- }`
	`2`	`+ "parent": "block/cube_all",`
	`3`	`+ "textures": {`
	`4`	`+ "all": "logisticspipes:solid_block/frame"`
	`5`	`+ }`
`6`	`6`	`}`