Moved tectech block registration to pre-init (#3281)

GTNewHorizons · Sep 25, 2024 · 07b4531 · 07b4531
1 parent 2bef993
commit 07b4531
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/bartworks/API/GlassTier.java b/src/main/java/bartworks/API/GlassTier.java
@@ -33,6 +33,7 @@ public static void addCustomGlass(String modname, String unlocalisedBlockName, i
     }
 
     public static void addCustomGlass(@NotNull Block block, int meta, int tier) {
+        Objects.requireNonNull(block, "Glass block cannot be null");
         GlassTier.glasses.put(new BlockMetaPair(block, (byte) meta), tier);
     }
 

diff --git a/src/main/java/tectech/loader/MainLoader.java b/src/main/java/tectech/loader/MainLoader.java
@@ -35,15 +35,19 @@ public static void preLoad() {
         } catch (Throwable t) {
             LOGGER.error("Loading textures...", t);
         }
-    }
 
-    public static void load() {
-        ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 6);
+        ProgressManager.ProgressBar progressBarPreload = ProgressManager.push("TecTech Preload", 1);
 
-        progressBarLoad.step("Regular Things");
+        progressBarPreload.step("Regular Things");
         new ThingsLoader().run();
         LOGGER.info("Block/Item Init Done");
 
+        ProgressManager.pop(progressBarPreload);
+    }
+
+    public static void load() {
+        ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 5);
+
         progressBarLoad.step("Machine Things");
         new MachineLoader().run();
         LOGGER.info("Machine Init Done");