From bfd1c22c0ecec926e199dd6adc0f63cf331bd807 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sat, 1 Oct 2022 01:52:20 +0200 Subject: Buffs (#382) * buffed thallium * swapped iron for zinc in thallium recipe * botmium recipe time 480s -> 120s * spotlessApply * fix recipe mistakes --- .../interfaces/internal/IGregtech_RecipeAdder.java | 11 +++++++++++ .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 20 +++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java index 530d7aa86c..de736dca7b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java @@ -167,6 +167,17 @@ public interface IGregtech_RecipeAdder { int aEUt, int aSpecialValue); + public boolean addBlastSmelterRecipe( + ItemStack[] aInput, + FluidStack aInputFluid, + FluidStack aOutput, + ItemStack[] aOutputStack, + int[] aChance, + int aDuration, + int aEUt, + int aSpecialValue, + boolean aOptimizeRecipe); + /** * Adds a Recipe for the LFTRr. (up to 9 Inputs) * diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java index 79363d7cb9..260e5a37fd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java @@ -537,6 +537,20 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { int aDuration, int aEUt, int aSpecialValue) { + return addBlastSmelterRecipe( + aInput, aInputFluid, aOutput, aOutputStack, aChance, aDuration, aEUt, aSpecialValue, true); + } + + public boolean addBlastSmelterRecipe( + ItemStack[] aInput, + FluidStack aInputFluid, + FluidStack aOutput, + ItemStack[] aOutputStack, + int[] aChance, + int aDuration, + int aEUt, + int aSpecialValue, + boolean aOptimizeRecipe) { if ((aInput == null) || (aOutput == null)) { Logger.WARNING("Fail - Input or Output was null."); return false; @@ -570,7 +584,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { int aSize = GTPP_Recipe.GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.mRecipeList.size(); int aSize2 = aSize; GTPP_Recipe.GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.addRecipe( - true, + aOptimizeRecipe, aInput, aOutputStack, null, @@ -582,10 +596,6 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { aSpecialValue); aSize = GTPP_Recipe.GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.mRecipeList.size(); - /*GTPP_Recipe.GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.addRecipe(true, aInput, aOutputStack, null, - aChance, new FluidStack[] { aInputFluid }, new FluidStack[] { aOutput }, aDuration, aEUt, - aSpecialValue);*/ - return aSize > aSize2; } -- cgit