Merge pull request #452 from btwonion/add-tripwire-visibility

add new built-in texture pack for recolored textures in dungeons

23 files changed, 854 insertions, 18 deletions

diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index 6e702e7b..681e24f3 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -41,6 +41,7 @@ import de.hysky.skyblocker.utils.scheduler.Scheduler;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.client.MinecraftClient;
 
 import java.nio.file.Path;
@@ -51,8 +52,9 @@ import java.nio.file.Path;
  * this class.
  */
 public class SkyblockerMod implements ClientModInitializer {
-    public static final String VERSION = FabricLoader.getInstance().getModContainer("skyblocker").orElseThrow().getMetadata().getVersion().getFriendlyString();
     public static final String NAMESPACE = "skyblocker";
+    public static final ModContainer SKYBLOCKER_MOD = FabricLoader.getInstance().getModContainer(NAMESPACE).orElseThrow();
+    public static final String VERSION = SKYBLOCKER_MOD.getMetadata().getVersion().getFriendlyString();
     public static final Path CONFIG_DIR = FabricLoader.getInstance().getConfigDir().resolve(NAMESPACE);
     public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
     private static SkyblockerMod INSTANCE;
@@ -112,6 +114,7 @@ public class SkyblockerMod implements ClientModInitializer {
         TheRift.init();
         TitleContainer.init();
         ScreenMaster.init();
+        DungeonTextures.init();
         OcclusionCulling.init();
         TeleportOverlay.init();
         CustomItemNames.init();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonTextures.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonTextures.java
new file mode 100644
index 00000000..1d55491f
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonTextures.java
@@ -0,0 +1,16 @@
+package de.hysky.skyblocker.skyblock.dungeon;
+
+import de.hysky.skyblocker.SkyblockerMod;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
+import net.minecraft.util.Identifier;
+
+public class DungeonTextures {
+    public static void init() {
+        ResourceManagerHelper.registerBuiltinResourcePack(
+                new Identifier(SkyblockerMod.NAMESPACE, "recolored_dungeon_items"),
+                SkyblockerMod.SKYBLOCKER_MOD,
+                ResourcePackActivationType.NORMAL
+        );
+    }
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java
index 210d8001..982fa16e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java
@@ -1,27 +1,25 @@
 package de.hysky.skyblocker.skyblock.tabhud.screenbuilder;
 
-import java.io.BufferedReader;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-
+import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.skyblock.tabhud.TabHud;
 import de.hysky.skyblocker.skyblock.tabhud.util.PlayerLocator;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
 import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.resource.Resource;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ScreenMaster {
 
@@ -82,12 +80,11 @@ public class ScreenMaster {
 
         // WHY MUST IT ALWAYS BE SUCH NESTED GARBAGE MINECRAFT KEEP THAT IN DFU FFS
 
-        FabricLoader.getInstance()
-                .getModContainer("skyblocker")
-                .ifPresent(container -> ResourceManagerHelper.registerBuiltinResourcePack(
-                        new Identifier("skyblocker", "top_aligned"),
-                        container,
-                        ResourcePackActivationType.NORMAL));
+        ResourceManagerHelper.registerBuiltinResourcePack(
+                new Identifier(SkyblockerMod.NAMESPACE, "top_aligned"),
+                SkyblockerMod.SKYBLOCKER_MOD,
+                ResourcePackActivationType.NORMAL
+        );
 
         ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(
                 // ...why are we instantiating an interface again?
@@ -113,9 +110,9 @@ public class ScreenMaster {
                             try (BufferedReader reader = MinecraftClient.getInstance().getResourceManager()
                                     .openAsReader(entry.getKey())) {
                                 JsonObject json = JsonParser.parseReader(reader).getAsJsonObject();
-                                 if (json.get("format_version").getAsInt() != VERSION) {
+                                if (json.get("format_version").getAsInt() != VERSION) {
                                     throw new IllegalStateException(String.format("Resource pack isn't compatible! Expected version %d, got %d", VERSION, json.get("format_version").getAsInt()));
-                                 }
+                                }
 
                             } catch (Exception ex) {
                                 throw new IllegalStateException(
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
new file mode 100644
index 00000000..2a64d955
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/blockstates/tripwire.json
@@ -0,0 +1,181 @@
+{
+  "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_attached_n.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_n.json
new file mode 100644
index 00000000..347303f1
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_n.json
@@ -0,0 +1,18 @@
+{
+	"textures": {
+		"particle": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [7, 2, 0],
+			"to": [9, 4, 16],
+			"faces": {
+				"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_attached_ne.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_ne.json
new file mode 100644
index 00000000..959618a9
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_ne.json
@@ -0,0 +1,37 @@
+{
+	"textures": {
+		"particle": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [7, 2, 0],
+			"to": [9, 4, 7],
+			"faces": {
+				"east": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"west": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "rotation": 90, "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "rotation": 90, "texture": "#particle"}
+			}
+		},
+		{
+			"from": [9, 2, 7],
+			"to": [16, 4, 9],
+			"faces": {
+				"north": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"south": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "texture": "#particle"}
+			}
+		},
+		{
+			"from": [7, 2, 7],
+			"to": [9, 4, 9],
+			"faces": {
+				"south": {"uv": [7, 0, 9, 2], "texture": "#particle"},
+				"west": {"uv": [7, 0, 9, 2], "texture": "#particle"},
+				"up": {"uv": [9, 2, 7, 0], "texture": "#particle"},
+				"down": {"uv": [9, 0, 7, 2], "texture": "#particle"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_ns.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_ns.json
new file mode 100644
index 00000000..82142f2f
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_ns.json
@@ -0,0 +1,17 @@
+{
+	"textures": {
+		"particle": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [7, 2, 0],
+			"to": [9, 4, 16],
+			"faces": {
+				"east": {"uv": [0, 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_attached_nse.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_nse.json
new file mode 100644
index 00000000..c252f191
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_nse.json
@@ -0,0 +1,46 @@
+{
+	"textures": {
+		"particle": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [7, 2, 0],
+			"to": [9, 4, 7],
+			"faces": {
+				"east": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"west": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "rotation": 90, "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "rotation": 90, "texture": "#particle"}
+			}
+		},
+		{
+			"from": [7, 2, 9],
+			"to": [9, 4, 16],
+			"faces": {
+				"east": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"west": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"up": {"uv": [16, 2, 9, 0], "rotation": 90, "texture": "#particle"},
+				"down": {"uv": [16, 0, 9, 2], "rotation": 90, "texture": "#particle"}
+			}
+		},
+		{
+			"from": [9, 2, 7],
+			"to": [16, 4, 9],
+			"faces": {
+				"north": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"south": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "texture": "#particle"}
+			}
+		},
+		{
+			"from": [7, 2, 7],
+			"to": [9, 4, 9],
+			"faces": {
+				"west": {"uv": [7, 0, 9, 2], "texture": "#particle"},
+				"up": {"uv": [9, 2, 7, 0], "texture": "#particle"},
+				"down": {"uv": [9, 0, 7, 2], "texture": "#particle"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_nsew.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_nsew.json
new file mode 100644
index 00000000..aaf6aaac
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_attached_nsew.json
@@ -0,0 +1,55 @@
+{
+	"textures": {
+		"particle": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [7, 2, 0],
+			"to": [9, 4, 7],
+			"faces": {
+				"east": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"west": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "rotation": 90, "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "rotation": 90, "texture": "#particle"}
+			}
+		},
+		{
+			"from": [7, 2, 9],
+			"to": [9, 4, 16],
+			"faces": {
+				"east": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"west": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"up": {"uv": [16, 2, 9, 0], "rotation": 90, "texture": "#particle"},
+				"down": {"uv": [16, 0, 9, 2], "rotation": 90, "texture": "#particle"}
+			}
+		},
+		{
+			"from": [0, 2, 7],
+			"to": [7, 4, 9],
+			"faces": {
+				"north": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"south": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"up": {"uv": [16, 2, 9, 0], "texture": "#particle"},
+				"down": {"uv": [16, 0, 9, 2], "texture": "#particle"}
+			}
+		},
+		{
+			"from": [9, 2, 7],
+			"to": [16, 4, 9],
+			"faces": {
+				"north": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"south": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "texture": "#particle"}
+			}
+		},
+		{
+			"from": [7, 2, 7],
+			"to": [9, 4, 9],
+			"faces": {
+				"up": {"uv": [9, 2, 7, 0], "texture": "#particle"},
+				"down": {"uv": [9, 0, 7, 2], "texture": "#particle"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_hook.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_hook.json
new file mode 100644
index 00000000..ea328892
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_hook.json
@@ -0,0 +1,79 @@
+{
+	"textures": {
+		"hook": "block/tripwire_hook",
+		"particle": "block/oak_planks",
+		"wood": "block/oak_planks"
+	},
+	"elements": [
+		{
+			"from": [6, 1, 14],
+			"to": [10, 9, 16],
+			"faces": {
+				"north": {"uv": [6, 7, 10, 15], "texture": "#wood"},
+				"east": {"uv": [14, 7, 16, 15], "texture": "#wood"},
+				"south": {"uv": [6, 7, 10, 15], "texture": "#wood", "cullface": "south"},
+				"west": {"uv": [0, 7, 2, 15], "texture": "#wood"},
+				"up": {"uv": [6, 0, 10, 2], "texture": "#wood"},
+				"down": {"uv": [6, 14, 10, 16], "texture": "#wood"}
+			}
+		},
+		{
+			"from": [5, 11, 8],
+			"to": [11, 12, 14],
+			"rotation": {"angle": -45, "axis": "x", "origin": [8, 6, 14]},
+			"faces": {
+				"north": {"uv": [5, 3, 11, 4], "texture": "#hook"},
+				"east": {"uv": [5, 3, 11, 4], "texture": "#hook"},
+				"south": {"uv": [5, 8, 11, 9], "texture": "#hook"},
+				"west": {"uv": [5, 8, 11, 9], "texture": "#hook"},
+				"up": {"uv": [5, 3, 11, 9], "texture": "#hook"},
+				"down": {"uv": [5, 3, 11, 9], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 11, 12],
+			"to": [9, 12, 12],
+			"rotation": {"angle": -45, "axis": "x", "origin": [8, 6, 14]},
+			"faces": {
+				"north": {"uv": [7, 8, 9, 9], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 11, 10],
+			"to": [7, 12, 12],
+			"rotation": {"angle": -45, "axis": "x", "origin": [8, 6, 14]},
+			"faces": {
+				"east": {"uv": [7, 8, 9, 9], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 11, 10],
+			"to": [9, 12, 10],
+			"rotation": {"angle": -45, "axis": "x", "origin": [8, 6, 14]},
+			"faces": {
+				"south": {"uv": [7, 3, 9, 4], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [9, 11, 10],
+			"to": [9, 12, 12],
+			"rotation": {"angle": -45, "axis": "x", "origin": [8, 6, 14]},
+			"faces": {
+				"west": {"uv": [7, 3, 9, 4], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 5, 9],
+			"to": [9, 7, 14],
+			"rotation": {"angle": 45, "axis": "x", "origin": [8, 6, 14]},
+			"faces": {
+				"north": {"uv": [7, 9, 9, 11], "texture": "#wood"},
+				"east": {"uv": [9, 9, 14, 11], "texture": "#wood"},
+				"south": {"uv": [7, 9, 9, 11], "texture": "#wood"},
+				"west": {"uv": [2, 9, 7, 11], "texture": "#wood"},
+				"up": {"uv": [7, 2, 9, 7], "texture": "#wood"},
+				"down": {"uv": [7, 9, 9, 14], "texture": "#wood"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_hook_attached.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_hook_attached.json
new file mode 100644
index 00000000..a5d64505
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_hook_attached.json
@@ -0,0 +1,91 @@
+{
+	"textures": {
+		"hook": "block/tripwire_hook",
+		"particle": "block/oak_planks",
+		"wood": "block/oak_planks",
+		"tripwire": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [6, 1, 14],
+			"to": [10, 9, 16],
+			"faces": {
+				"north": {"uv": [6, 7, 10, 15], "texture": "#wood"},
+				"east": {"uv": [14, 7, 16, 15], "texture": "#wood"},
+				"south": {"uv": [6, 7, 10, 15], "texture": "#wood", "cullface": "south"},
+				"west": {"uv": [0, 7, 2, 15], "texture": "#wood"},
+				"up": {"uv": [6, 0, 10, 2], "texture": "#wood"},
+				"down": {"uv": [6, 14, 10, 16], "texture": "#wood"}
+			}
+		},
+		{
+			"from": [5, 4.5, 3],
+			"to": [11, 5.5, 9],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 5, 9]},
+			"faces": {
+				"north": {"uv": [5, 3, 11, 4], "texture": "#hook"},
+				"east": {"uv": [5, 3, 11, 4], "texture": "#hook"},
+				"south": {"uv": [5, 8, 11, 9], "texture": "#hook"},
+				"west": {"uv": [5, 8, 11, 9], "texture": "#hook"},
+				"up": {"uv": [5, 3, 11, 9], "texture": "#hook"},
+				"down": {"uv": [5, 3, 11, 9], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 4.5, 7],
+			"to": [9, 5.5, 7],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 5, 9]},
+			"faces": {
+				"north": {"uv": [7, 8, 9, 9], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 4.5, 5],
+			"to": [7, 5.5, 7],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 5, 9]},
+			"faces": {
+				"east": {"uv": [7, 8, 9, 9], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 4.5, 5],
+			"to": [9, 5.5, 5],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 5, 9]},
+			"faces": {
+				"south": {"uv": [7, 3, 9, 4], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [9, 4.5, 5],
+			"to": [9, 5.5, 7],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 5, 9]},
+			"faces": {
+				"west": {"uv": [7, 3, 9, 4], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 4, 9],
+			"to": [9, 6, 14],
+			"faces": {
+				"north": {"uv": [7, 9, 9, 11], "texture": "#wood"},
+				"east": {"uv": [9, 9, 14, 11], "texture": "#wood"},
+				"south": {"uv": [7, 9, 9, 11], "texture": "#wood"},
+				"west": {"uv": [2, 9, 7, 11], "texture": "#wood"},
+				"up": {"uv": [7, 2, 9, 7], "texture": "#wood"},
+				"down": {"uv": [7, 9, 9, 14], "texture": "#wood"}
+			}
+		},
+		{
+			"from": [7, 2, 0],
+			"to": [9, 4, 6],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 2], "texture": "#tripwire"},
+				"east": {"uv": [0, 0, 6, 2], "texture": "#tripwire"},
+				"south": {"uv": [4, 0, 6, 2], "texture": "#tripwire"},
+				"west": {"uv": [0, 0, 6, 2], "texture": "#tripwire"},
+				"up": {"uv": [0, 0, 6, 2], "rotation": 90, "texture": "#tripwire"},
+				"down": {"uv": [0, 0, 6, 2], "rotation": 90, "texture": "#tripwire"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_hook_attached_on.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_hook_attached_on.json
new file mode 100644
index 00000000..75ca6655
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_hook_attached_on.json
@@ -0,0 +1,87 @@
+{
+	"textures": {
+		"hook": "block/tripwire_hook",
+		"particle": "block/oak_planks",
+		"wood": "block/oak_planks",
+		"tripwire": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [6, 1, 14],
+			"to": [10, 9, 16],
+			"faces": {
+				"north": {"uv": [6, 7, 10, 15], "texture": "#wood"},
+				"east": {"uv": [14, 7, 16, 15], "texture": "#wood"},
+				"south": {"uv": [6, 7, 10, 15], "texture": "#wood", "cullface": "south"},
+				"west": {"uv": [0, 7, 2, 15], "texture": "#wood"},
+				"up": {"uv": [6, 0, 10, 2], "texture": "#wood"},
+				"down": {"uv": [6, 14, 10, 16], "texture": "#wood"}
+			}
+		},
+		{
+			"from": [5, 0.5, 3],
+			"to": [11, 1.5, 9],
+			"faces": {
+				"north": {"uv": [5, 3, 11, 4], "texture": "#hook"},
+				"east": {"uv": [5, 3, 11, 4], "texture": "#hook"},
+				"south": {"uv": [5, 8, 11, 9], "texture": "#hook"},
+				"west": {"uv": [5, 8, 11, 9], "texture": "#hook"},
+				"up": {"uv": [5, 3, 11, 9], "texture": "#hook"},
+				"down": {"uv": [5, 3, 11, 9], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 0.5, 7],
+			"to": [9, 1.5, 7],
+			"faces": {
+				"north": {"uv": [7, 8, 9, 9], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 0.5, 5],
+			"to": [7, 1.5, 7],
+			"faces": {
+				"east": {"uv": [7, 8, 9, 9], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 0.5, 5],
+			"to": [9, 1.5, 5],
+			"faces": {
+				"south": {"uv": [7, 3, 9, 4], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [9, 0.5, 5],
+			"to": [9, 1.5, 7],
+			"faces": {
+				"west": {"uv": [7, 3, 9, 4], "texture": "#hook"}
+			}
+		},
+		{
+			"from": [7, 2, 9],
+			"to": [9, 4, 14],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 3, 14]},
+			"faces": {
+				"north": {"uv": [7, 9, 9, 11], "texture": "#wood"},
+				"east": {"uv": [9, 9, 14, 11], "texture": "#wood"},
+				"south": {"uv": [7, 9, 9, 11], "texture": "#wood"},
+				"west": {"uv": [2, 9, 7, 11], "texture": "#wood"},
+				"up": {"uv": [7, 2, 9, 7], "texture": "#wood"},
+				"down": {"uv": [7, 9, 9, 14], "texture": "#wood"}
+			}
+		},
+		{
+			"from": [7, 0, 0],
+			"to": [9, 2, 6],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 2], "texture": "#tripwire"},
+				"east": {"uv": [0, 0, 6, 2], "texture": "#tripwire"},
+				"south": {"uv": [4, 0, 6, 2], "texture": "#tripwire"},
+				"west": {"uv": [0, 0, 6, 2], "texture": "#tripwire"},
+				"up": {"uv": [0, 0, 6, 2], "rotation": 90, "texture": "#tripwire"},
+				"down": {"uv": [0, 0, 6, 2], "rotation": 90, "texture": "#tripwire"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_n.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_n.json
new file mode 100644
index 00000000..65ff3d1e
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_n.json
@@ -0,0 +1,18 @@
+{
+	"textures": {
+		"particle": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [7, 0, 0],
+			"to": [9, 2, 16],
+			"faces": {
+				"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_ne.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_ne.json
new file mode 100644
index 00000000..df6d05a5
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_ne.json
@@ -0,0 +1,37 @@
+{
+	"textures": {
+		"particle": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [7, 0, 0],
+			"to": [9, 2, 7],
+			"faces": {
+				"east": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"west": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "rotation": 90, "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "rotation": 90, "texture": "#particle"}
+			}
+		},
+		{
+			"from": [9, 0, 7],
+			"to": [16, 2, 9],
+			"faces": {
+				"north": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"south": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "texture": "#particle"}
+			}
+		},
+		{
+			"from": [7, 0, 7],
+			"to": [9, 2, 9],
+			"faces": {
+				"south": {"uv": [7, 0, 9, 2], "texture": "#particle"},
+				"west": {"uv": [7, 0, 9, 2], "texture": "#particle"},
+				"up": {"uv": [9, 2, 7, 0], "texture": "#particle"},
+				"down": {"uv": [9, 0, 7, 2], "texture": "#particle"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_ns.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_ns.json
new file mode 100644
index 00000000..3b5b07ec
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_ns.json
@@ -0,0 +1,17 @@
+{
+	"textures": {
+		"particle": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [7, 0, 0],
+			"to": [9, 2, 16],
+			"faces": {
+				"east": {"uv": [0, 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_nse.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_nse.json
new file mode 100644
index 00000000..5c7e21c6
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_nse.json
@@ -0,0 +1,46 @@
+{
+	"textures": {
+		"particle": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [7, 0, 0],
+			"to": [9, 2, 7],
+			"faces": {
+				"east": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"west": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "rotation": 90, "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "rotation": 90, "texture": "#particle"}
+			}
+		},
+		{
+			"from": [7, 0, 9],
+			"to": [9, 2, 16],
+			"faces": {
+				"east": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"west": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"up": {"uv": [16, 2, 9, 0], "rotation": 90, "texture": "#particle"},
+				"down": {"uv": [16, 0, 9, 2], "rotation": 90, "texture": "#particle"}
+			}
+		},
+		{
+			"from": [9, 0, 7],
+			"to": [16, 2, 9],
+			"faces": {
+				"north": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"south": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "texture": "#particle"}
+			}
+		},
+		{
+			"from": [7, 0, 7],
+			"to": [9, 2, 9],
+			"faces": {
+				"west": {"uv": [7, 0, 9, 2], "texture": "#particle"},
+				"up": {"uv": [9, 2, 7, 0], "texture": "#particle"},
+				"down": {"uv": [9, 0, 7, 2], "texture": "#particle"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_nsew.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_nsew.json
new file mode 100644
index 00000000..86c54072
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_nsew.json
@@ -0,0 +1,55 @@
+{
+	"textures": {
+		"particle": "block/red_wool"
+	},
+	"elements": [
+		{
+			"from": [7, 0, 0],
+			"to": [9, 2, 7],
+			"faces": {
+				"east": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"west": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "rotation": 90, "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "rotation": 90, "texture": "#particle"}
+			}
+		},
+		{
+			"from": [7, 0, 9],
+			"to": [9, 2, 16],
+			"faces": {
+				"east": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"west": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"up": {"uv": [16, 2, 9, 0], "rotation": 90, "texture": "#particle"},
+				"down": {"uv": [16, 0, 9, 2], "rotation": 90, "texture": "#particle"}
+			}
+		},
+		{
+			"from": [0, 0, 7],
+			"to": [7, 2, 9],
+			"faces": {
+				"north": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"south": {"uv": [9, 0, 16, 2], "texture": "#particle"},
+				"up": {"uv": [16, 2, 9, 0], "texture": "#particle"},
+				"down": {"uv": [16, 0, 9, 2], "texture": "#particle"}
+			}
+		},
+		{
+			"from": [9, 0, 7],
+			"to": [16, 2, 9],
+			"faces": {
+				"north": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"south": {"uv": [0, 0, 7, 2], "texture": "#particle"},
+				"up": {"uv": [7, 2, 0, 0], "texture": "#particle"},
+				"down": {"uv": [7, 0, 0, 2], "texture": "#particle"}
+			}
+		},
+		{
+			"from": [7, 0, 7],
+			"to": [9, 2, 9],
+			"faces": {
+				"up": {"uv": [9, 2, 7, 0], "texture": "#particle"},
+				"down": {"uv": [9, 0, 7, 2], "texture": "#particle"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_n.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_n.json
new file mode 100644
index 00000000..9e3799e7
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_n.json
@@ -0,0 +1,6 @@
+{
+	"parent": "block/tripwire_n",
+	"textures": {
+		"particle": "block/red_wool"
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_ne.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_ne.json
new file mode 100644
index 00000000..c54b69cb
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_ne.json
@@ -0,0 +1,6 @@
+{
+	"parent": "block/tripwire_ne",
+	"textures": {
+		"particle": "block/red_wool"
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_ns.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_ns.json
new file mode 100644
index 00000000..2a2b4929
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_ns.json
@@ -0,0 +1,6 @@
+{
+	"parent": "block/tripwire_ns",
+	"textures": {
+		"particle": "block/red_wool"
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_nse.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_nse.json
new file mode 100644
index 00000000..e0556198
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_nse.json
@@ -0,0 +1,6 @@
+{
+	"parent": "block/tripwire_nse",
+	"textures": {
+		"particle": "block/red_wool"
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_nsew.json b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_nsew.json
new file mode 100644
index 00000000..5eb6e0bc
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/assets/minecraft/models/block/tripwire_powered_nsew.json
@@ -0,0 +1,6 @@
+{
+	"parent": "block/tripwire_nsew",
+	"textures": {
+		"particle": "block/red_wool"
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/pack.mcmeta b/src/main/resources/resourcepacks/recolored_dungeon_items/pack.mcmeta
new file mode 100644
index 00000000..9533c3d9
--- /dev/null
+++ b/src/main/resources/resourcepacks/recolored_dungeon_items/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+    "pack": {
+      "pack_format": 22,
+      "description": "Recolored textures found in dungeons"
+    }
+}
\ No newline at end of file