aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java101
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java19
2 files changed, 103 insertions, 17 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index ac0ab3bd61..83f3466812 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -12,6 +12,7 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.init.Blocks;
@@ -53,12 +54,102 @@ public class RECIPES_GREGTECH {
}
private static void blastSmelterRecipes() {
- /*CORE.RA.addBlastSmelterRecipe(
- new ItemStack[]{},
- FluidUtils.getFluidStack(fluidName, amount),
+
+ //Black Bronze
+ CORE.RA.addBlastSmelterRecipe(
+ new ItemStack[]{
+ ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3),
+ },
+ FluidUtils.getFluidStack("molten.blackbronze", 5*144),
+ 0,
+ MathUtils.findPercentageOfInt(200*20, 80),
+ 120);
+
+ //Black Steel
+ CORE.RA.addBlastSmelterRecipe(
+ new ItemStack[]{
+ ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 15),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3)
+ },
+ FluidUtils.getFluidStack("molten.blacksteel", 25*144),
0,
- aDuration,
- aEUt)*/
+ MathUtils.findPercentageOfInt(60*20, 80),
+ 120);
+
+ //Red Steel
+ CORE.RA.addBlastSmelterRecipe(
+ new ItemStack[]{
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustBismuth", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 10),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 20)
+ },
+ FluidUtils.getFluidStack("molten.redsteel", 40*144),
+ 0,
+ MathUtils.findPercentageOfInt(65*20, 80),
+ 120);
+
+ //Blue Steel
+ CORE.RA.addBlastSmelterRecipe(
+ new ItemStack[]{
+ ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 12),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 18),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 30),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 60)
+
+ },
+ FluidUtils.getFluidStack("molten.bluesteel", 125*144),
+ 0,
+ MathUtils.findPercentageOfInt(70*20, 80),
+ 120);
+
+ //TungstenSteel
+ CORE.RA.addBlastSmelterRecipe(
+ new ItemStack[]{
+ ItemUtils.getItemStackOfAmountFromOreDict("ingotTungsten", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("ingotSteel", 1)
+ },
+ FluidUtils.getFluidStack("molten.tungstensteel", 2*144),
+ 0,
+ MathUtils.findPercentageOfInt(300*20, 80),
+ 120);
+
+ //Stainless Steel
+ CORE.RA.addBlastSmelterRecipe(
+ new ItemStack[]{
+ ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 6),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1)
+ },
+ FluidUtils.getFluidStack("molten.stainlesssteel", 9*144),
+ 0,
+ MathUtils.findPercentageOfInt(85*20, 80),
+ 120);
+
+ //Eglin
+ CORE.RA.addBlastSmelterRecipe(
+ new ItemStack[]{
+ ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 23),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 3),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 12)
+ },
+ FluidUtils.getFluidStack("molten.eglinsteel", 48*144),
+ 0,
+ MathUtils.findPercentageOfInt(30*20, 80),
+ 120);
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
index 2cf667da4f..19ac201007 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
@@ -42,9 +42,11 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
}
}
}
- case ingot:
- if (aMaterial.mBlastFurnaceRequired) {
- addBlastRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, null, null, aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L), 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L), null, (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, 120, aMaterial);
+ case ingot:
+ if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) && (!aMaterial.contains(SubTag.NO_SMELTING))) {
+ if (aMaterial.mBlastFurnaceRequired) {
+ addBlastRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, null, null, aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) : GT_Utility.copyAmount(1L, new Object[]{tDustStack}), null, (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, 120, aMaterial);
+ }
}
break;
case dustSmall:
@@ -104,16 +106,9 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
//Cannot handle two input fluids
return false;
}
+
FluidStack mInputfluidstack;
- if (fluid1 != null && fluid2 == null){
- mInputfluidstack = fluid1;
- }
- else if (fluid1 == null && fluid2 != null){
- mInputfluidstack = fluid2;
- }
- else {
- mInputfluidstack = null;
- }
+ mInputfluidstack = (fluid1 != null) ? fluid1 : fluid2;
//Try with new handler
//Add Blast Smelter Recipe.
generated by cgit (git 2.46.0) at 2025-03-10 09:45:34 +0000