Refactor

7 files changed, 201 insertions, 248 deletions

diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index 23359749..1e3c4e7d 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -37,6 +37,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;
@@ -47,8 +48,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;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonTextures.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonTextures.java
index d8259a06..1d55491f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonTextures.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonTextures.java
@@ -1,18 +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.fabricmc.loader.api.FabricLoader;
 import net.minecraft.util.Identifier;
 
 public class DungeonTextures {
     public static void init() {
-        FabricLoader.getInstance()
-            .getModContainer("skyblocker")
-            .ifPresent(container -> ResourceManagerHelper.registerBuiltinResourcePack(
-                new Identifier("skyblocker", "recolored_dungeon_items"),
-                container,
+        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
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