diff options
4 files changed, 56 insertions, 14 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 0efad890ee..db0ffb00f7 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -673,7 +673,10 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.PIKYONIUM); MaterialGenerator.generate(ALLOY.ABYSSAL); MaterialGenerator.generate(ALLOY.LAURENIUM); - MaterialGenerator.generate(ALLOY.BOTMIUM); + + // abs recipe in RECIPES_GREGTECH.java + MaterialGenerator.generate(ALLOY.BOTMIUM, true, false); + MaterialGenerator.generate(ALLOY.HS188A); MaterialGenerator.generate(ALLOY.TITANSTEEL); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index aeec1e783d..1832b06558 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1034,15 +1034,18 @@ public class RECIPES_GREGTECH { CORE.RA.addBlastSmelterRecipe( new ItemStack[] { ItemUtils.getGregtechCircuit(21), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIron", 12), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 16), - ELEMENT.getInstance().CARBON.getDust(64), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedZinc", 3), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 4), + ELEMENT.getInstance().CARBON.getDust(16), }, - Materials.SulfuricAcid.getFluid(5000), - ELEMENT.getInstance().THALLIUM.getFluidStack(288 + 144), - 0, - 20 * 300, - 8000); + Materials.SulfuricAcid.getFluid(1250), + ELEMENT.getInstance().THALLIUM.getFluidStack(288), + new ItemStack[] {}, + new int[] {0}, + 20 * 75, + 8000, + 3700, + false); // Strontium processing CORE.RA.addBlastSmelterRecipe( @@ -1060,6 +1063,21 @@ public class RECIPES_GREGTECH { new int[] {10000, 10000}, // Output Chance 20 * 120, 480 * 4); + + // molten botmium + CORE.RA.addBlastSmelterRecipe( + new ItemStack[] { + ItemUtils.getGregtechCircuit(4), + ItemUtils.getItemStackOfAmountFromOreDict("dustNitinol60", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 6), + ItemUtils.getItemStackOfAmountFromOreDict("dustRuthenium", 6), + ItemUtils.getItemStackOfAmountFromOreDict("dustThallium", 3) + }, + GT_Values.NF, + ALLOY.BOTMIUM.getFluidStack(2304), + 0, + 20 * 120, + 491520); } private static void fluidcannerRecipes() { 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; } |