diff options
author | boubou19 <miisterunknown@gmail.com> | 2024-08-15 15:38:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-15 15:38:58 +0200 |
commit | 0f990a7cfd78c3ede4db09a893e1e6edff164a2a (patch) | |
tree | 5ab69d203be91a1c15313f61d9172f9bbdd4ba82 /src/main/java/gregtech/loaders/oreprocessing | |
parent | 33c8d91bbe289651270378316fdadab730aa386f (diff) | |
download | GT5-Unofficial-0f990a7cfd78c3ede4db09a893e1e6edff164a2a.tar.gz GT5-Unofficial-0f990a7cfd78c3ede4db09a893e1e6edff164a2a.tar.bz2 GT5-Unofficial-0f990a7cfd78c3ede4db09a893e1e6edff164a2a.zip |
Cleanup (#2803)
* remove dead code
* use proper materials for tiered circuits
* remove yet another RA1 call
* remove deprecated usage
* small step toward Research station assline recipes migration
* remove dead code
* remove dead code
* remove dead code
* migrate BW recipes
* remove some more RA1 code
* remove bad search and replace + spotlessapply
* yeet deprecated code and change how sieverts for recipes are computed
* fix loading
* fix bad replacements
* spotless apply
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
-rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java | 50 |
1 files changed, 37 insertions, 13 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index b3aad4e25c..ed152fc47f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -1,8 +1,10 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; +import static gregtech.api.recipe.RecipeMaps.oreWasherRecipes; import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -52,19 +54,41 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .eut(2) .addTo(maceratorRecipes); - GT_ModHandler.addOreWasherRecipe( - GT_Utility.copyAmount(1, aStack), - new int[] { 10000, 1111, 10000 }, - 1000, - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get( - OrePrefixes.dust, - GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)); + RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1, aStack)) + .itemOutputs( + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get( + OrePrefixes.dust, + GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) + .outputChances(100_00, 11_11, 100_00) + .fluidInputs(GT_ModHandler.getWater(1000)) + .duration(25 * SECONDS) + .eut(16) + .addTo(oreWasherRecipes); + + RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1, aStack)) + .itemOutputs( + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get( + OrePrefixes.dust, + GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) + .outputChances(100_00, 11_11, 100_00) + .fluidInputs(GT_ModHandler.getDistilledWater(200)) + .duration(15 * SECONDS) + .eut(16) + .addTo(oreWasherRecipes); OrePrefixes prefix = aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedCentrifuged : OrePrefixes.dust; |