diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2023-04-30 13:43:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-30 14:43:08 +0200 |
| commit | 5192502fe5beeeca0fc6100106b58ab725651b36 (patch) | |
| tree | 9e7bc116a3787f8085be609b5260d6da9f3a0e24 /src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java | |
| parent | 2c4471c5c36b3a709523feb7d68f196ca89914d5 (diff) | |
| download | GT5-Unofficial-5192502fe5beeeca0fc6100106b58ab725651b36.tar.gz GT5-Unofficial-5192502fe5beeeca0fc6100106b58ab725651b36.tar.bz2 GT5-Unofficial-5192502fe5beeeca0fc6100106b58ab725651b36.zip | |
Some more ra2 fixes (#1932)
* multiple RA2 fixes
* revert the revert of my work
why do I have to fix shit multiple times
* more fixes
* and more
* these dont exist and are always null
* sa
* better check
* and another forgotten null check
* fix turbine blades
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java')
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java | 106 |
1 files changed, 46 insertions, 60 deletions
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 |