diff options
author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java | |
parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip |
The Great Renaming (#3014)
* move kekztech to a single root dir
* move detrav to a single root dir
* move gtnh-lanthanides to a single root dir
* move tectech and delete some gross reflection in gt++
* remove more reflection inside gt5u
* delete more reflection in gt++
* fix imports
* move bartworks and bwcrossmod
* fix proxies
* move galactigreg and ggfab
* move gtneioreplugin
* try to fix gt++ bee loader
* apply the rename rules to BW
* apply rename rules to bwcrossmod
* apply rename rules to detrav scanner mod
* apply rename rules to galacticgreg
* apply rename rules to ggfab
* apply rename rules to goodgenerator
* apply rename rules to gtnh-lanthanides
* apply rename rules to gt++
* apply rename rules to kekztech
* apply rename rules to kubatech
* apply rename rules to tectech
* apply rename rules to gt
apply the rename rules to gt
* fix tt import
* fix mui hopefully
* fix coremod except intergalactic
* rename assline recipe class
* fix a class name i stumbled on
* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib
* temporary rename of GTTooltipDataCache to old name
* fix gt client/server proxy names
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java')
-rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java index 1f97e1e32a..b8a39737cc 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java @@ -1,21 +1,21 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTUtility.calculateRecipeEU; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; import gregtech.api.enums.ToolDictNames; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; @SuppressWarnings("RedundantLabeledSwitchRuleCodeBlock") public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -42,13 +42,13 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr case pipeHuge, pipeLarge, pipeMedium, pipeSmall, pipeTiny -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L), + GTModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "h w", "PPP", 'P', OrePrefixes.plate.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 6L), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 6L), + GTModHandler.RecipeBits.BUFFERED, new Object[] { "PWP", "P P", "PHP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), @@ -57,9 +57,9 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr : ToolDictNames.craftingToolHardHammer, 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw : ToolDictNames.craftingToolWrench }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 2L), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 2L), + GTModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "W H", "PPP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), @@ -68,9 +68,9 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr : ToolDictNames.craftingToolHardHammer, 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw : ToolDictNames.craftingToolWrench }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), + GTModHandler.RecipeBits.BUFFERED, new Object[] { "PHP", "P P", "PWP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), @@ -79,21 +79,21 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr : ToolDictNames.craftingToolHardHammer, 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw : ToolDictNames.craftingToolWrench }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), + GTModHandler.RecipeBits.BUFFERED, new Object[] { "DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial) }); } } case pipeRestrictiveHuge, pipeRestrictiveLarge, pipeRestrictiveMedium, pipeRestrictiveSmall, pipeRestrictiveTiny -> { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.ring, Materials.Steel, aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount), - GT_OreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + GTOreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .duration( ((int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount)) * TICKS) .eut(4) @@ -102,17 +102,17 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr case pipeQuadruple -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1), - GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1), + GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "MM ", "MM ", " ", 'M', - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) }); + GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) }); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 4), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 4), + GTUtility.getIntegratedCircuit(9)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1)) .duration(3 * SECONDS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(assemblerRecipes); @@ -120,17 +120,17 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr case pipeNonuple -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PPP", "PPP", "PPP", 'P', GT_OreDictUnificator + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(1, aStack), + GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, + new Object[] { "PPP", "PPP", "PPP", 'P', GTOreDictUnificator .get(aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) }); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 9), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, aMaterial, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 9), + GTUtility.getIntegratedCircuit(9)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeNonuple, aMaterial, 1)) .duration(3 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(assemblerRecipes); |