diff options
author | chochem <40274384+chochem@users.noreply.github.com> | 2023-05-01 09:32:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-01 10:32:14 +0200 |
commit | 6e1dc3c8a9fcb5c8e6584116ca0caf561cef311a (patch) | |
tree | ab894167a769284f486ccacda5c715edad9af499 /src/main/java | |
parent | af5e36ca4213abe6f07b0dbf2be76a4f80c2f8cb (diff) | |
download | GT5-Unofficial-6e1dc3c8a9fcb5c8e6584116ca0caf561cef311a.tar.gz GT5-Unofficial-6e1dc3c8a9fcb5c8e6584116ca0caf561cef311a.tar.bz2 GT5-Unofficial-6e1dc3c8a9fcb5c8e6584116ca0caf561cef311a.zip |
fix ore chembathing (#1941)
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index e7cbc80241..cd595a7e62 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -81,23 +81,23 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .eut(48) .addTo(sThermalCentrifugeRecipes); - addChemicalBathRecipes(aMaterial, aStack, aPrefix); + addChemicalBathRecipes(aMaterial, aMaterial, aStack, aPrefix); for (Materials tMaterial : aMaterial.mOreByProducts) { - addChemicalBathRecipes(tMaterial, aStack, aPrefix); + addChemicalBathRecipes(aMaterial, tMaterial, aStack, aPrefix); } } - private void addChemicalBathRecipes(Materials material, ItemStack stack, OrePrefixes prefix) { + private void addChemicalBathRecipes(Materials material, Materials byproduct, ItemStack stack, OrePrefixes prefix) { OrePrefixes chemicalBathPrefix = prefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure; - if (material.contains(SubTag.WASHING_MERCURY)) { + if (byproduct.contains(SubTag.WASHING_MERCURY)) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, stack)) .itemOutputs( GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, material.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 7000, 4000) .fluidInputs(Materials.Mercury.getFluid(1000L)) @@ -106,12 +106,12 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .eut(8) .addTo(sChemicalBathRecipes); } - if (material.contains(SubTag.WASHING_MERCURY_99_PERCENT)) { + if (byproduct.contains(SubTag.WASHING_MERCURY_99_PERCENT)) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, stack)) .itemOutputs( GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, material.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 9900, 4000) .fluidInputs(Materials.Mercury.getFluid(1000L)) @@ -120,12 +120,12 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .eut(8) .addTo(sChemicalBathRecipes); } - if (material.contains(SubTag.WASHING_SODIUMPERSULFATE)) { + if (byproduct.contains(SubTag.WASHING_SODIUMPERSULFATE)) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, stack)) .itemOutputs( GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, material.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 7000, 4000) .fluidInputs(Materials.SodiumPersulfate.getFluid(100L)) |