Update to new halplibe.

MartinSVK12 · Mar 28, 2024 · 91284fb · 91284fb
1 parent 29189ae
commit 91284fb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ bta_version=7.1-pre2a
 loader_version=0.15.6-babric.4-bta
 
 # Mods
-halplibe_version=3.4.17
+halplibe_version=3.5.0
 modmenu_version=2.0.4
 dragonfly_version=1.4.4-7.1
 btwaila_version=1.0.9-7.1

diff --git a/src/main/java/sunsetsatellite/signalindustries/recipes/RecipeNamespaceSI.java b/src/main/java/sunsetsatellite/signalindustries/recipes/RecipeNamespaceSI.java
@@ -4,19 +4,4 @@
 
 public class RecipeNamespaceSI extends RecipeNamespace {
 
-    /*public List<RecipeEntryMachineFluid> getAllExtractorRecipes(){
-        ArrayList<RecipeEntryMachineFluid> list = new ArrayList<>();
-        for (RecipeEntryBase<?, ?, ?> recipe : getItem("extractor").getAllRecipes()) {
-            list.add((RecipeEntryMachineFluid) recipe);
-        }
-        return Collections.unmodifiableList(list);
-    }
-
-    public List<RecipeEntryMachine> getAllCrusherRecipes(){
-        ArrayList<RecipeEntryMachine> list = new ArrayList<>();
-        for (RecipeEntryBase<?, ?, ?> recipe : getItem("crusher").getAllRecipes()) {
-            list.add((RecipeEntryMachine) recipe);
-        }
-        return Collections.unmodifiableList(list);
-    }*/
 }
diff --git a/src/main/java/sunsetsatellite/signalindustries/recipes/container/SIRecipes.java b/src/main/java/sunsetsatellite/signalindustries/recipes/container/SIRecipes.java
@@ -81,6 +81,13 @@ public static void load(){
         new CrystalChamberRecipes().addRecipes(CRYSTAL_CHAMBER);
         new InfuserRecipes().addRecipes(INFUSER);
         new CentrifugeRecipes().addRecipes(CENTRIFUGE);
+        DataLoader.loadRecipesFromFile("/assets/signalindustries/recipes/workbench.json");
+        SignalIndustries.LOGGER.info(SIGNAL_INDUSTRIES.getAllRecipes().size()+" recipes in "+SIGNAL_INDUSTRIES.size()+" groups.");
+    }
+
+    @Override
+    public void initNamespaces() {
+        resetGroups();
         SIGNAL_INDUSTRIES.register("workbench",WORKBENCH);
         SIGNAL_INDUSTRIES.register("extractor",EXTRACTOR);
         SIGNAL_INDUSTRIES.register("crusher",CRUSHER);
@@ -92,7 +99,5 @@ public static void load(){
         SIGNAL_INDUSTRIES.register("infuser",INFUSER);
         SIGNAL_INDUSTRIES.register("centrifuge",CENTRIFUGE);
         Registries.RECIPES.register("signalindustries",SIGNAL_INDUSTRIES);
-        DataLoader.loadRecipesFromFile("/assets/signalindustries/recipes/workbench.json");
-        SignalIndustries.LOGGER.info(SIGNAL_INDUSTRIES.getAllRecipes().size()+" recipes in "+SIGNAL_INDUSTRIES.size()+" groups.");
     }
 }