Cleanup recipemaps

GTNewHorizons · Dec 1, 2023 · 4a7eb30 · 4a7eb30
1 parent f482e61
commit 4a7eb30
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 62 deletions.
diff --git a/.../elisis/gtnhlanth/loader/RecipeAdder.java → ...nth/api/recipe/LanthanidesRecipeMaps.java b/.../elisis/gtnhlanth/loader/RecipeAdder.java → ...nth/api/recipe/LanthanidesRecipeMaps.java
@@ -1,4 +1,4 @@
-package com.elisis.gtnhlanth.loader;
+package com.elisis.gtnhlanth.api.recipe;
 
 import gregtech.api.gui.modularui.GT_UITextures;
 import gregtech.api.recipe.RecipeMap;
@@ -7,14 +7,13 @@
 import gregtech.nei.formatter.HeatingCoilSpecialValueFormatter;
 import gregtech.nei.formatter.SimpleSpecialValueFormatter;
 
-public class RecipeAdder {
+public class LanthanidesRecipeMaps {
 
-    public static final RecipeAdder instance = new RecipeAdder();
-
-    public final RecipeMap<RecipeMapBackend> DigesterRecipes = RecipeMapBuilder.of("gtnhlanth.recipe.digester")
+    public static final RecipeMap<RecipeMapBackend> digesterRecipes = RecipeMapBuilder.of("gtnhlanth.recipe.digester")
             .maxIO(1, 1, 1, 1).minInputs(1, 1).progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
             .neiSpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE).build();
-    public final RecipeMap<RecipeMapBackend> DissolutionTankRecipes = RecipeMapBuilder.of("gtnhlanth.recipe.disstank")
-            .maxIO(2, 3, 2, 1).minInputs(1, 1).progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+    public static final RecipeMap<RecipeMapBackend> dissolutionTankRecipes = RecipeMapBuilder
+            .of("gtnhlanth.recipe.disstank").maxIO(2, 3, 2, 1).minInputs(1, 1)
+            .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
             .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.disstank")).build();
 }
diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
@@ -18,7 +18,7 @@
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.elisis.gtnhlanth.loader.RecipeAdder;
+import com.elisis.gtnhlanth.api.recipe.LanthanidesRecipeMaps;
 import com.elisis.gtnhlanth.util.DescTextLocalization;
 import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
@@ -93,7 +93,7 @@ public void setCoilLevel(HeatingCoilLevel level) {
 
     @Override
     public RecipeMap<?> getRecipeMap() {
-        return RecipeAdder.instance.DigesterRecipes;
+        return LanthanidesRecipeMaps.digesterRecipes;
     }
 
     @Override
@@ -107,8 +107,7 @@ public boolean checkRecipe(ItemStack itemStack) {
 
         // GT_Log.out.print("Digester: " + Arrays.toString(mInventory));
 
-        // Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList;
-        GT_Recipe tRecipe = RecipeAdder.instance.DigesterRecipes
+        GT_Recipe tRecipe = LanthanidesRecipeMaps.digesterRecipes
                 .findRecipe(getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems);
 
         if (tRecipe == null || !tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) return false;

diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
@@ -19,7 +19,7 @@
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.elisis.gtnhlanth.loader.RecipeAdder;
+import com.elisis.gtnhlanth.api.recipe.LanthanidesRecipeMaps;
 import com.elisis.gtnhlanth.util.DescTextLocalization;
 import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
 import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
@@ -90,7 +90,7 @@ private boolean addGlass(Block block, int meta) {
 
     @Override
     public RecipeMap<?> getRecipeMap() {
-        return RecipeAdder.instance.DissolutionTankRecipes;
+        return LanthanidesRecipeMaps.dissolutionTankRecipes;
     }
 
     @Override
@@ -102,7 +102,7 @@ public boolean checkRecipe(ItemStack itemStack) {
         ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]);
         long tVoltage = this.getMaxInputVoltage();
 
-        GT_Recipe tRecipe = RecipeAdder.instance.DissolutionTankRecipes
+        GT_Recipe tRecipe = LanthanidesRecipeMaps.dissolutionTankRecipes
                 .findRecipe(getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems);
 
         if (tRecipe == null || !tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) return false;