diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
6 files changed, 109 insertions, 110 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java index 0f4451df53..ff6f4022c8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java @@ -23,20 +23,23 @@ public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecip public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(10 * TICKS) - .eut(16) - .addTo(sHammerRecipes); - - GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), - null, - 10, - false); + if (aMaterial.mMacerateInto != null + && GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_ModHandler.addPulverisationRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + null, + 10, + false); + } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index cce860dd27..6058abbddd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -258,16 +258,19 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver // Laser engraver recipes { - is.stackSize = 0; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3L, aStack), is) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sLaserEngraverRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L) != null) { + is.stackSize = 0; + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(3L, aStack), is) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sLaserEngraverRecipes); + } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 64b086e37b..a874d9991d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -164,14 +164,16 @@ 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), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(Math.max(aMaterialMass * 2L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(Math.max(aMaterialMass * 2L, 1L)) + .eut(calculateRecipeEU(aMaterial, 96)) + .addTo(sBenderRecipes); + } if (GregTech_API.sRecipeFile.get( gregtech.api.enums.ConfigCategories.Tools.hammerdoubleplate, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java index 1a9031e64a..049fe75d1a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java @@ -50,14 +50,16 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe if (!aMaterial.contains(SubTag.NO_SMASHING)) { // Bender recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(10 * SECONDS) - .eut(calculateRecipeEU(aMaterial, 16)) - .addTo(sBenderRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(calculateRecipeEU(aMaterial, 16)) + .addTo(sBenderRecipes); + } } if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index cb05d1218d..464fc90cd6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -1168,16 +1168,19 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg } // Turbine blades - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 2L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(10 * SECONDS) - .eut(calculateRecipeEU(aMaterial, 60)) - .addTo(sPressRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null + && GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 3L), + GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 2L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(calculateRecipeEU(aMaterial, 60)) + .addTo(sPressRecipes); + } } } default -> {} diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java index c71069661b..c86387427f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java @@ -33,55 +33,37 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Wood" -> // Chemical bath recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L)) - .fluidInputs( - Materials.SeedOil - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true))) - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.ULV) - .addTo(sChemicalBathRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L)) - .fluidInputs( - Materials.SeedOilLin - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true))) - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.ULV) - .addTo(sChemicalBathRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L)) - .fluidInputs( - Materials.SeedOilHemp - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true))) - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.ULV) - .addTo(sChemicalBathRecipes); - - } - case "Iron" -> { - // Chemical bath recipes - { + if (GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L) != null) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) + .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L)) .fluidInputs( - Materials.FierySteel - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true))) + Materials.SeedOil + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true))) .noFluidOutputs() .duration(5 * SECONDS) .eut(TierEU.ULV) .addTo(sChemicalBathRecipes); } + } + case "Iron" -> { + // Chemical bath recipes + { + if (GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) + .fluidInputs( + Materials.FierySteel.getFluid( + GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true))) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.ULV) + .addTo(sChemicalBathRecipes); + } + } + // Polarizer recipes { GT_Values.RA.addPolarizerRecipe( @@ -94,16 +76,18 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "WroughtIron" -> { // Chemical bath recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) - .fluidInputs( - Materials.FierySteel - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true))) - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.ULV) - .addTo(sChemicalBathRecipes); + if (GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) + .fluidInputs( + Materials.FierySteel.getFluid( + GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true))) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.ULV) + .addTo(sChemicalBathRecipes); + } } // Polarizer recipes @@ -118,16 +102,18 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Steel" -> { // Chemical Bath recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) - .fluidInputs( - Materials.FierySteel - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true))) - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.ULV) - .addTo(sChemicalBathRecipes); + if (GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) + .fluidInputs( + Materials.FierySteel.getFluid( + GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true))) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.ULV) + .addTo(sChemicalBathRecipes); + } } // polarizer recipes |