From dbc10704fdbff100d1ae592aa0ddf1dc8b1aeca0 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 12 Sep 2024 22:30:04 +0200 Subject: Merge config categories (#3152) Co-authored-by: miozune Co-authored-by: Martin Robertz --- .../java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java | 4 ++-- .../gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders') 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 { -- cgit