Refactor

4 files changed, 179 insertions, 223 deletions

diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/blockstates/tripwire.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/blockstates/tripwire.json
index a2d9db94..2a64d955 100644
--- a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/blockstates/tripwire.json
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/blockstates/tripwire.json
@@ -1,181 +1,181 @@
 {
-	"variants": {
-		"powered=true,attached=true,east=false,north=false,south=false,west=false": {
-			"model": "block/tripwire_powered"
-		},
-		"powered=true,attached=true,east=false,north=false,south=false,west=true": {
-			"model": "block/tripwire_powered_n",
-			"y": 270
-		},
-		"powered=true,attached=true,east=false,north=false,south=true,west=false": {
-			"model": "block/tripwire_powered_n",
-			"y": 180
-		},
-		"powered=true,attached=true,east=false,north=false,south=true,west=true": {
-			"model": "block/tripwire_powered_ne",
-			"y": 180
-		},
-		"powered=true,attached=true,east=false,north=true,south=false,west=false": {
-			"model": "block/tripwire_powered_n"
-		},
-		"powered=true,attached=true,east=false,north=true,south=false,west=true": {
-			"model": "block/tripwire_powered_ne",
-			"y": 270
-		},
-		"powered=true,attached=true,east=false,north=true,south=true,west=false": {
-			"model": "block/tripwire_powered_ns"
-		},
-		"powered=true,attached=true,east=false,north=true,south=true,west=true": {
-			"model": "block/tripwire_powered_nse",
-			"y": 180
-		},
-		"powered=true,attached=true,east=true,north=false,south=false,west=false": {
-			"model": "block/tripwire_powered_n",
-			"y": 90
-		},
-		"powered=true,attached=true,east=true,north=false,south=false,west=true": {
-			"model": "block/tripwire_powered_ns",
-			"y": 90
-		},
-		"powered=true,attached=true,east=true,north=false,south=true,west=false": {
-			"model": "block/tripwire_powered_ne",
-			"y": 90
-		},
-		"powered=true,attached=true,east=true,north=false,south=true,west=true": {
-			"model": "block/tripwire_powered_nse",
-			"y": 90
-		},
-		"powered=true,attached=true,east=true,north=true,south=false,west=false": {
-			"model": "block/tripwire_powered_ne"
-		},
-		"powered=true,attached=true,east=true,north=true,south=false,west=true": {
-			"model": "block/tripwire_powered_nse",
-			"y": 270
-		},
-		"powered=true,attached=true,east=true,north=true,south=true,west=false": {
-			"model": "block/tripwire_powered_nse"
-		},
-		"powered=true,attached=true,east=true,north=true,south=true,west=true": {
-			"model": "block/tripwire_powered_nsew"
-		},
-		"powered=true,attached=false,east=false,north=false,south=false,west=false": {
-			"model": "block/tripwire"
-		},
-		"powered=false,attached=false,east=false,north=false,south=false,west=false": {
-			"model": "block/tripwire"
-		},
-		"powered=false,attached=false,east=false,north=false,south=false,west=true": {
-			"model": "block/tripwire_n",
-			"y": 270
-		},
-		"powered=false,attached=false,east=false,north=false,south=true,west=false": {
-			"model": "block/tripwire_n",
-			"y": 180
-		},
-		"powered=false,attached=false,east=false,north=false,south=true,west=true": {
-			"model": "block/tripwire_ne",
-			"y": 180
-		},
-		"powered=false,attached=false,east=false,north=true,south=false,west=false": {
-			"model": "block/tripwire_n"
-		},
-		"powered=false,attached=false,east=false,north=true,south=false,west=true": {
-			"model": "block/tripwire_ne",
-			"y": 270
-		},
-		"powered=false,attached=false,east=false,north=true,south=true,west=false": {
-			"model": "block/tripwire_ns"
-		},
-		"powered=false,attached=false,east=false,north=true,south=true,west=true": {
-			"model": "block/tripwire_nse",
-			"y": 180
-		},
-		"powered=false,attached=false,east=true,north=false,south=false,west=false": {
-			"model": "block/tripwire_n",
-			"y": 90
-		},
-		"powered=false,attached=false,east=true,north=false,south=false,west=true": {
-			"model": "block/tripwire_ns",
-			"y": 90
-		},
-		"powered=false,attached=false,east=true,north=false,south=true,west=false": {
-			"model": "block/tripwire_ne",
-			"y": 90
-		},
-		"powered=false,attached=false,east=true,north=false,south=true,west=true": {
-			"model": "block/tripwire_nse",
-			"y": 90
-		},
-		"powered=false,attached=false,east=true,north=true,south=false,west=false": {
-			"model": "block/tripwire_ne"
-		},
-		"powered=false,attached=false,east=true,north=true,south=false,west=true": {
-			"model": "block/tripwire_nse",
-			"y": 270
-		},
-		"powered=false,attached=false,east=true,north=true,south=true,west=false": {
-			"model": "block/tripwire_nse"
-		},
-		"powered=false,attached=false,east=true,north=true,south=true,west=true": {
-			"model": "block/tripwire_nsew"
-		},
-		"powered=false,attached=true,east=false,north=false,south=false,west=false": {
-			"model": "block/tripwire_attached"
-		},
-		"powered=false,attached=true,east=false,north=false,south=false,west=true": {
-			"model": "block/tripwire_attached_n",
-			"y": 270
-		},
-		"powered=false,attached=true,east=false,north=false,south=true,west=false": {
-			"model": "block/tripwire_attached_n",
-			"y": 180
-		},
-		"powered=false,attached=true,east=false,north=false,south=true,west=true": {
-			"model": "block/tripwire_attached_ne",
-			"y": 180
-		},
-		"powered=false,attached=true,east=false,north=true,south=false,west=false": {
-			"model": "block/tripwire_attached_n"
-		},
-		"powered=false,attached=true,east=false,north=true,south=false,west=true": {
-			"model": "block/tripwire_attached_ne",
-			"y": 270
-		},
-		"powered=false,attached=true,east=false,north=true,south=true,west=false": {
-			"model": "block/tripwire_attached_ns"
-		},
-		"powered=false,attached=true,east=false,north=true,south=true,west=true": {
-			"model": "block/tripwire_attached_nse",
-			"y": 180
-		},
-		"powered=false,attached=true,east=true,north=false,south=false,west=false": {
-			"model": "block/tripwire_attached_n",
-			"y": 90
-		},
-		"powered=false,attached=true,east=true,north=false,south=false,west=true": {
-			"model": "block/tripwire_attached_ns",
-			"y": 90
-		},
-		"powered=false,attached=true,east=true,north=false,south=true,west=false": {
-			"model": "block/tripwire_attached_ne",
-			"y": 90
-		},
-		"powered=false,attached=true,east=true,north=false,south=true,west=true": {
-			"model": "block/tripwire_attached_nse",
-			"y": 90
-		},
-		"powered=false,attached=true,east=true,north=true,south=false,west=false": {
-			"model": "block/tripwire_attached_ne"
-		},
-		"powered=false,attached=true,east=true,north=true,south=false,west=true": {
-			"model": "block/tripwire_attached_nse",
-			"y": 270
-		},
-		"powered=false,attached=true,east=true,north=true,south=true,west=false": {
-			"model": "block/tripwire_attached_nse"
-		},
-		"powered=false,attached=true,east=true,north=true,south=true,west=true": {
-			"model": "block/tripwire_attached_nsew"
-		}
-	}
+  "variants": {
+    "powered=true,attached=true,east=false,north=false,south=false,west=false": {
+      "model": "block/tripwire_powered_ns"
+    },
+    "powered=true,attached=true,east=false,north=false,south=false,west=true": {
+      "model": "block/tripwire_powered_n",
+      "y": 270
+    },
+    "powered=true,attached=true,east=false,north=false,south=true,west=false": {
+      "model": "block/tripwire_powered_n",
+      "y": 180
+    },
+    "powered=true,attached=true,east=false,north=false,south=true,west=true": {
+      "model": "block/tripwire_powered_ne",
+      "y": 180
+    },
+    "powered=true,attached=true,east=false,north=true,south=false,west=false": {
+      "model": "block/tripwire_powered_n"
+    },
+    "powered=true,attached=true,east=false,north=true,south=false,west=true": {
+      "model": "block/tripwire_powered_ne",
+      "y": 270
+    },
+    "powered=true,attached=true,east=false,north=true,south=true,west=false": {
+      "model": "block/tripwire_powered_ns"
+    },
+    "powered=true,attached=true,east=false,north=true,south=true,west=true": {
+      "model": "block/tripwire_powered_nse",
+      "y": 180
+    },
+    "powered=true,attached=true,east=true,north=false,south=false,west=false": {
+      "model": "block/tripwire_powered_n",
+      "y": 90
+    },
+    "powered=true,attached=true,east=true,north=false,south=false,west=true": {
+      "model": "block/tripwire_powered_ns",
+      "y": 90
+    },
+    "powered=true,attached=true,east=true,north=false,south=true,west=false": {
+      "model": "block/tripwire_powered_ne",
+      "y": 90
+    },
+    "powered=true,attached=true,east=true,north=false,south=true,west=true": {
+      "model": "block/tripwire_powered_nse",
+      "y": 90
+    },
+    "powered=true,attached=true,east=true,north=true,south=false,west=false": {
+      "model": "block/tripwire_powered_ne"
+    },
+    "powered=true,attached=true,east=true,north=true,south=false,west=true": {
+      "model": "block/tripwire_powered_nse",
+      "y": 270
+    },
+    "powered=true,attached=true,east=true,north=true,south=true,west=false": {
+      "model": "block/tripwire_powered_nse"
+    },
+    "powered=true,attached=true,east=true,north=true,south=true,west=true": {
+      "model": "block/tripwire_powered_nsew"
+    },
+    "powered=true,attached=false,east=false,north=false,south=false,west=false": {
+      "model": "block/tripwire_ns"
+    },
+    "powered=false,attached=false,east=false,north=false,south=false,west=false": {
+      "model": "block/tripwire_ns"
+    },
+    "powered=false,attached=false,east=false,north=false,south=false,west=true": {
+      "model": "block/tripwire_n",
+      "y": 270
+    },
+    "powered=false,attached=false,east=false,north=false,south=true,west=false": {
+      "model": "block/tripwire_n",
+      "y": 180
+    },
+    "powered=false,attached=false,east=false,north=false,south=true,west=true": {
+      "model": "block/tripwire_ne",
+      "y": 180
+    },
+    "powered=false,attached=false,east=false,north=true,south=false,west=false": {
+      "model": "block/tripwire_n"
+    },
+    "powered=false,attached=false,east=false,north=true,south=false,west=true": {
+      "model": "block/tripwire_ne",
+      "y": 270
+    },
+    "powered=false,attached=false,east=false,north=true,south=true,west=false": {
+      "model": "block/tripwire_ns"
+    },
+    "powered=false,attached=false,east=false,north=true,south=true,west=true": {
+      "model": "block/tripwire_nse",
+      "y": 180
+    },
+    "powered=false,attached=false,east=true,north=false,south=false,west=false": {
+      "model": "block/tripwire_n",
+      "y": 90
+    },
+    "powered=false,attached=false,east=true,north=false,south=false,west=true": {
+      "model": "block/tripwire_ns",
+      "y": 90
+    },
+    "powered=false,attached=false,east=true,north=false,south=true,west=false": {
+      "model": "block/tripwire_ne",
+      "y": 90
+    },
+    "powered=false,attached=false,east=true,north=false,south=true,west=true": {
+      "model": "block/tripwire_nse",
+      "y": 90
+    },
+    "powered=false,attached=false,east=true,north=true,south=false,west=false": {
+      "model": "block/tripwire_ne"
+    },
+    "powered=false,attached=false,east=true,north=true,south=false,west=true": {
+      "model": "block/tripwire_nse",
+      "y": 270
+    },
+    "powered=false,attached=false,east=true,north=true,south=true,west=false": {
+      "model": "block/tripwire_nse"
+    },
+    "powered=false,attached=false,east=true,north=true,south=true,west=true": {
+      "model": "block/tripwire_nsew"
+    },
+    "powered=false,attached=true,east=false,north=false,south=false,west=false": {
+      "model": "block/tripwire_attached_ns"
+    },
+    "powered=false,attached=true,east=false,north=false,south=false,west=true": {
+      "model": "block/tripwire_attached_n",
+      "y": 270
+    },
+    "powered=false,attached=true,east=false,north=false,south=true,west=false": {
+      "model": "block/tripwire_attached_n",
+      "y": 180
+    },
+    "powered=false,attached=true,east=false,north=false,south=true,west=true": {
+      "model": "block/tripwire_attached_ne",
+      "y": 180
+    },
+    "powered=false,attached=true,east=false,north=true,south=false,west=false": {
+      "model": "block/tripwire_attached_n"
+    },
+    "powered=false,attached=true,east=false,north=true,south=false,west=true": {
+      "model": "block/tripwire_attached_ne",
+      "y": 270
+    },
+    "powered=false,attached=true,east=false,north=true,south=true,west=false": {
+      "model": "block/tripwire_attached_ns"
+    },
+    "powered=false,attached=true,east=false,north=true,south=true,west=true": {
+      "model": "block/tripwire_attached_nse",
+      "y": 180
+    },
+    "powered=false,attached=true,east=true,north=false,south=false,west=false": {
+      "model": "block/tripwire_attached_n",
+      "y": 90
+    },
+    "powered=false,attached=true,east=true,north=false,south=false,west=true": {
+      "model": "block/tripwire_attached_ns",
+      "y": 90
+    },
+    "powered=false,attached=true,east=true,north=false,south=true,west=false": {
+      "model": "block/tripwire_attached_ne",
+      "y": 90
+    },
+    "powered=false,attached=true,east=true,north=false,south=true,west=true": {
+      "model": "block/tripwire_attached_nse",
+      "y": 90
+    },
+    "powered=false,attached=true,east=true,north=true,south=false,west=false": {
+      "model": "block/tripwire_attached_ne"
+    },
+    "powered=false,attached=true,east=true,north=true,south=false,west=true": {
+      "model": "block/tripwire_attached_nse",
+      "y": 270
+    },
+    "powered=false,attached=true,east=true,north=true,south=true,west=false": {
+      "model": "block/tripwire_attached_nse"
+    },
+    "powered=false,attached=true,east=true,north=true,south=true,west=true": {
+      "model": "block/tripwire_attached_nsew"
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire.json
deleted file mode 100644
index 390f26a4..00000000
--- a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"textures": {
-		"particle": "block/red_wool"
-	},
-	"elements": [
-		{
-			"from": [7, 0, 0],
-			"to": [9, 2, 16],
-			"faces": {
-				"north": {"uv": [0, 0, 2, 2], "texture": "#particle"},
-				"east": {"uv": [0, 0, 16, 2], "texture": "#particle"},
-				"south": {"uv": [14, 0, 16, 2], "texture": "#particle"},
-				"west": {"uv": [0, 0, 16, 2], "texture": "#particle"},
-				"up": {"uv": [16, 2, 0, 0], "rotation": 90, "texture": "#particle"},
-				"down": {"uv": [16, 0, 0, 2], "rotation": 90, "texture": "#particle"}
-			}
-		}
-	]
-}
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached.json
deleted file mode 100644
index 9718c2cb..00000000
--- a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"textures": {
-		"particle": "block/red_wool"
-	},
-	"elements": [
-		{
-			"from": [7, 2, 0],
-			"to": [9, 4, 16],
-			"faces": {
-				"north": {"uv": [0, 0, 2, 2], "texture": "#particle"},
-				"east": {"uv": [0, 0, 16, 2], "texture": "#particle"},
-				"south": {"uv": [14, 0, 16, 2], "texture": "#particle"},
-				"west": {"uv": [0, 0, 16, 2], "texture": "#particle"},
-				"up": {"uv": [16, 2, 0, 0], "rotation": 90, "texture": "#particle"},
-				"down": {"uv": [16, 0, 0, 2], "rotation": 90, "texture": "#particle"}
-			}
-		}
-	]
-}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered.json
deleted file mode 100644
index b666aa1f..00000000
--- a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "block/tripwire",
-	"textures": {
-		"particle": "block/red_wool"
-	}
-}
\ No newline at end of file