Merge config categories (#3152)

Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

4 files changed, 9 insertions, 26 deletions

diff --git a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java
deleted file mode 100644
index 310f6f540d..0000000000
--- a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package gtPlusPlus.api.recipe;
-
-import static gregtech.api.recipe.RecipeCategory.createIcon;
-
-import gregtech.api.enums.Mods;
-import gregtech.api.recipe.RecipeCategory;
-import gregtech.api.recipe.RecipeCategoryHolder;
-
-public class GTPPRecipeCategories {
-
-    @RecipeCategoryHolder
-    public static final RecipeCategory absNonAlloyRecipes = new RecipeCategory(
-        "gtpp.recipe.category.abs_non_alloy_recipes",
-        GTPPRecipeMaps.alloyBlastSmelterRecipes,
-        builder -> builder.setDisplayImage(
-            createIcon(Mods.GTPlusPlus.getResourcePath("textures", "gui", "picture", "abs_non_alloy_recipes.png"))));
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java
index 0bcf503daf..22de5388f9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java
@@ -54,7 +54,7 @@ import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.MultiblockTooltipBuilder;
-import gregtech.common.config.machinestats.ConfigMassFabricator;
+import gregtech.common.config.MachineStats;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.GTPPCore;
@@ -145,10 +145,10 @@ public class MTEMassFabricator extends GTPPMultiBlockBase<MTEMassFabricator> imp
     @Override
     public void onConfigLoad() {
         super.onConfigLoad();
-        sDurationMultiplier = ConfigMassFabricator.durationMultiplier;
-        sUUAperUUM = ConfigMassFabricator.UUAPerUUM;
-        sUUASpeedBonus = ConfigMassFabricator.UUASpeedBonus;
-        sRequiresUUA = ConfigMassFabricator.requiresUUA;
+        sDurationMultiplier = MachineStats.massFabricator.durationMultiplier;
+        sUUAperUUM = MachineStats.massFabricator.UUAPerUUM;
+        sUUASpeedBonus = MachineStats.massFabricator.UUASpeedBonus;
+        sRequiresUUA = MachineStats.massFabricator.requiresUUA;
     }
 
     public static boolean sInit = false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
index d90e842394..a0104cd809 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
@@ -16,11 +16,11 @@ import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
+import gregtech.api.recipe.RecipeCategories;
 import gregtech.api.util.GTRecipeBuilder;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.recipe.GTPPRecipeCategories;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialStack;
@@ -136,7 +136,7 @@ public class RecipeGenBlastSmelter extends RecipeGenBase {
                     .fluidOutputs(M.getFluidStack(fluidAmount))
                     .duration(duration / (mTotalPartsCounter > 0 ? mTotalPartsCounter : 1))
                     .eut(aVoltage)
-                    .recipeCategory(GTPPRecipeCategories.absNonAlloyRecipes)
+                    .recipeCategory(RecipeCategories.absNonAlloyRecipes)
                     .addTo(alloyBlastSmelterRecipes);
             } else {
                 Logger.WARNING("[BAS] Failed.");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java
index 84a9290d87..a78b517268 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java
@@ -11,12 +11,12 @@ import net.minecraftforge.oredict.OreDictionary;
 import org.apache.commons.lang3.ArrayUtils;
 
 import gregtech.api.enums.GTValues;
+import gregtech.api.recipe.RecipeCategories;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.ItemStackData;
-import gtPlusPlus.api.recipe.GTPPRecipeCategories;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -215,7 +215,7 @@ public class RecipeGenBlastSmelterGTNH {
                         .duration(MathUtils.roundToClosestInt(time * 0.8))
                         .eut(voltage)
                         .recipeCategory(
-                            inputLength <= 2 ? GTPPRecipeCategories.absNonAlloyRecipes
+                            inputLength <= 2 ? RecipeCategories.absNonAlloyRecipes
                                 : GTPPRecipeMaps.alloyBlastSmelterRecipes.getDefaultRecipeCategory())
                         .addTo(GTPPRecipeMaps.alloyBlastSmelterRecipes);
                 } else {