diff options
Diffstat (limited to 'src/main/java')
11 files changed, 277 insertions, 207 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index d385c9b0c2..8a1532b066 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -83,14 +83,16 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist if (tStack2 != null) tStack2.stackSize = 9; if (tStack3 != null) tStack3.stackSize = 9; - GT_Values.RA.stdBuilder() - .itemInputs(aStack) - .itemOutputs(tStack2) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(24) - .addTo(sHammerRecipes); + if (tStack2 != null) { + GT_Values.RA.stdBuilder() + .itemInputs(aStack) + .itemOutputs(tStack2) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(24) + .addTo(sHammerRecipes); + } if (GregTech_API.sRecipeFile.get( ConfigCategories.Recipes.storageblockdecrafting, @@ -105,7 +107,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) }); } - if (!OrePrefixes.block.isIgnored(aMaterial)) { + if (!OrePrefixes.block.isIgnored(aMaterial) && tStack1 != null) { // 9 ingots -> 1 block GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L)) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 758ffcd3b9..804bded008 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -81,7 +81,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } else if (!aMaterial.contains(SubTag.NO_WORKING)) { if ((!OrePrefixes.block.isIgnored(aMaterial)) - && (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))) { + && (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) + && GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack)) @@ -107,14 +108,16 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && (aMaterial != Materials.Clay)) { // compressor recipe { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(15 * SECONDS) - .eut(2) - .addTo(sCompressorRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java index abaf8a78bb..e92e2d0d7d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java @@ -29,7 +29,9 @@ public class ProcessingFoil implements IOreRecipeRegistrator { private void registerBenderRecipe(Materials material) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.plate, material, 4L))) + .itemInputs( + GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.plate, material, 4L)), + GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.foil, material, 4L)) .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java index 1340ca18a9..7d5d9a79c0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java @@ -46,7 +46,7 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr private void registerBenderRecipes(ItemStack stack) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, stack)) + .itemInputs(GT_Utility.copyAmount(1L, stack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Food_Flat_Dough.get(1L)) .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index e5e4822124..cce860dd27 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -54,7 +54,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra aMaterial.mFuelType); } - if (!OrePrefixes.block.isIgnored(aMaterial)) { + if (!OrePrefixes.block.isIgnored(aMaterial) + && GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) { // Compressor recipes { GT_Values.RA.stdBuilder() @@ -78,89 +79,105 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aNoSmashing) { // Forge hammer recipes { - GT_Values.RA.stdBuilder() - .itemInputs(aStack) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS) - .eut(16) - .addTo(sHammerRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(aStack) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + } } } else { // Forge hammer recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass, 1L)) - .eut(calculateRecipeEU(aMaterial, 16)) - .addTo(sHammerRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass, 1L)) + .eut(calculateRecipeEU(aMaterial, 16)) + .addTo(sHammerRecipes); + } } // Bender recipes { - // Plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration((int) Math.max(aMaterialMass * 2L, 1L)) - .eut(calculateRecipeEU(aMaterial, 24)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + // Plate + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration((int) Math.max(aMaterialMass * 2L, 1L)) + .eut(calculateRecipeEU(aMaterial, 24)) + .addTo(sBenderRecipes); + } - // Double plates - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 2L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null) { + // Double plates + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 2L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } - // Triple plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 3L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L) != null) { + // Triple plate + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 3L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } - // Quadruple plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 4L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) { + // Quadruple plate + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(4L, aStack), GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 4L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } - // Quintuple plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(5L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 5L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L) != null) { + // Quintuple plate + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(5L, aStack), GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 5L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } - // dense plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 9L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) { + // dense plate + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(9L, aStack), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 9L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } } } if (aNoWorking) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index 324c21d3aa..d65e48b9e9 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -101,68 +101,82 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Bender recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass, 1L)) - .eut(calculateRecipeEU(aMaterial, 24)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass, 1L)) + .eut(calculateRecipeEU(aMaterial, 24)) + .addTo(sBenderRecipes); + } - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 2L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 2L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 3L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 3L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 4L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(4L, aStack), GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 4L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(5L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 5L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(5L, aStack), GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 5L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 9L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(9L, aStack), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 9L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 2L, 1L)) - .eut(calculateRecipeEU(aMaterial, 24)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 2L, 1L)) + .eut(calculateRecipeEU(aMaterial, 24)) + .addTo(sBenderRecipes); + } } } break; @@ -172,7 +186,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // bender recipes { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) .noFluidInputs() .noFluidOutputs() @@ -181,7 +195,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2L, aStack)) + .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) .noFluidInputs() .noFluidOutputs() @@ -207,7 +221,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Bender recipes { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) .noFluidInputs() .noFluidOutputs() @@ -216,7 +230,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3L, aStack)) + .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) .noFluidInputs() .noFluidOutputs() @@ -242,7 +256,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Bender recipes { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) .noFluidInputs() .noFluidOutputs() @@ -269,7 +283,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Bender recipes { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index e3bb175d29..64b086e37b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -165,7 +165,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { // 2 double -> 1 quadruple plate GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2L, aStack)) + .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) .noFluidInputs() .noFluidOutputs() @@ -192,7 +192,9 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist // 2 plates -> 1 double plate GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), + GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .noFluidInputs() .noFluidOutputs() @@ -223,7 +225,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist // 3 triple plates -> 1 dense plate GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3L, aStack)) + .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) .noFluidInputs() .noFluidOutputs() @@ -256,7 +258,9 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), + GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .noFluidInputs() .noFluidOutputs() @@ -322,7 +326,9 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist // Quadruple plate GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), + GT_Utility.getIntegratedCircuit(4)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .noFluidInputs() .noFluidOutputs() @@ -376,7 +382,9 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist // quintuple plate GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), + GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .noFluidInputs() .noFluidOutputs() @@ -406,7 +414,9 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { // Dense plate GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), + GT_Utility.getIntegratedCircuit(9)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java index 80e7d16ff0..024a2183dd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java @@ -58,24 +58,28 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { // bender recipe { + if (GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(calculateRecipeEU(aMaterial, 8)) + .addTo(sBenderRecipes); + } + } + + if (GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L)) + .itemInputs(GT_Utility.copyAmount(2L, aStack)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L)) .noFluidInputs() .noFluidOutputs() - .duration(5 * SECONDS) - .eut(calculateRecipeEU(aMaterial, 8)) - .addTo(sBenderRecipes); + .duration(Math.max(aMaterial.getMass(), 1L)) + .eut(calculateRecipeEU(aMaterial, 16)) + .addTo(sHammerRecipes); } - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterial.getMass(), 1L)) - .eut(calculateRecipeEU(aMaterial, 16)) - .addTo(sHammerRecipes); } GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java index 8136d988c3..1a9031e64a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java @@ -51,7 +51,7 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe // Bender recipes { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L)) .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index e420017b79..600c6e8292 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -57,24 +57,28 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (!aMaterial.contains(SubTag.NO_SMASHING)) { // Bender recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(calculateRecipeEU(aMaterial, 8)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(calculateRecipeEU(aMaterial, 8)) + .addTo(sBenderRecipes); + } } // Wiremill Recipes { - GT_Values.RA.addWiremillRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L), - 200, - calculateRecipeEU(aMaterial, 8)); + if (GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) { + GT_Values.RA.addWiremillRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L), + 200, + calculateRecipeEU(aMaterial, 8)); + } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java index f5e99899f2..9ff738a780 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java @@ -303,7 +303,7 @@ public class BenderRecipes implements Runnable { .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.IC2_Mixed_Metal_Ingot.get(1L)) + .itemInputs(ItemList.IC2_Mixed_Metal_Ingot.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 1L)) .noFluidInputs() .noFluidOutputs() @@ -312,52 +312,64 @@ public class BenderRecipes implements Runnable { .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 12L)) - .itemOutputs(ItemList.Cell_Empty.get(6L)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.Cell_Empty.get(1L)) .noFluidInputs() .noFluidOutputs() - .duration(60 * SECONDS) + .duration(10 * SECONDS) .eut(8) .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 12L)) - .itemOutputs(ItemList.Cell_Empty.get(12L)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.Cell_Empty.get(1L)) .noFluidInputs() .noFluidOutputs() - .duration(60 * SECONDS) + .duration(5 * SECONDS) .eut(8) .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 12L)) - .itemOutputs(ItemList.Cell_Empty.get(48L)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.Cell_Empty.get(4L)) .noFluidInputs() .noFluidOutputs() - .duration(60 * SECONDS) + .duration(5 * SECONDS) .eut(8) .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 12L)) - .itemOutputs(new ItemStack(Items.bucket, 4, 0)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 3L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(new ItemStack(Items.bucket, 1, 0)) .noFluidInputs() .noFluidOutputs() - .duration(40 * SECONDS) + .duration(10 * SECONDS) .eut(4) .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 12L)) - .itemOutputs(new ItemStack(Items.bucket, 4, 0)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 3L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(new ItemStack(Items.bucket, 1, 0)) .noFluidInputs() .noFluidOutputs() - .duration(40 * SECONDS) + .duration(10 * SECONDS) .eut(4) .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 2L)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 2L), + GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", 1L)) .noFluidInputs() .noFluidOutputs() @@ -366,7 +378,9 @@ public class BenderRecipes implements Runnable { .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L)) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L), + GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.IC2_Food_Can_Empty.get(1L)) .noFluidInputs() .noFluidOutputs() |