From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: 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 --- .../loaders/oreprocessing/ProcessingBeans.java | 14 +- .../loaders/oreprocessing/ProcessingBlock.java | 88 +- .../loaders/oreprocessing/ProcessingBolt.java | 12 +- .../loaders/oreprocessing/ProcessingCell.java | 244 +++--- .../loaders/oreprocessing/ProcessingCircuit.java | 12 +- .../oreprocessing/ProcessingCompressed.java | 8 +- .../loaders/oreprocessing/ProcessingCrafting.java | 264 +++--- .../loaders/oreprocessing/ProcessingCrop.java | 47 +- .../oreprocessing/ProcessingCrushedOre.java | 68 +- .../oreprocessing/ProcessingCrystallized.java | 24 +- .../loaders/oreprocessing/ProcessingDirty.java | 96 +- .../loaders/oreprocessing/ProcessingDust.java | 380 ++++---- .../loaders/oreprocessing/ProcessingDye.java | 40 +- .../loaders/oreprocessing/ProcessingFineWire.java | 16 +- .../loaders/oreprocessing/ProcessingFoil.java | 20 +- .../loaders/oreprocessing/ProcessingFood.java | 46 +- .../loaders/oreprocessing/ProcessingGear.java | 62 +- .../loaders/oreprocessing/ProcessingGem.java | 428 ++++----- .../loaders/oreprocessing/ProcessingIngot.java | 184 ++-- .../loaders/oreprocessing/ProcessingItem.java | 24 +- .../loaders/oreprocessing/ProcessingLens.java | 65 +- .../loaders/oreprocessing/ProcessingLog.java | 262 +++--- .../loaders/oreprocessing/ProcessingNugget.java | 54 +- .../loaders/oreprocessing/ProcessingOre.java | 130 +-- .../loaders/oreprocessing/ProcessingOrePoor.java | 34 +- .../oreprocessing/ProcessingOreSmelting.java | 68 +- .../loaders/oreprocessing/ProcessingPipe.java | 84 +- .../loaders/oreprocessing/ProcessingPlank.java | 104 +-- .../loaders/oreprocessing/ProcessingPlate.java | 324 +++---- .../loaders/oreprocessing/ProcessingPure.java | 26 +- .../loaders/oreprocessing/ProcessingRawOre.java | 126 +-- .../loaders/oreprocessing/ProcessingRecycling.java | 24 +- .../loaders/oreprocessing/ProcessingRotor.java | 56 +- .../loaders/oreprocessing/ProcessingRound.java | 34 +- .../loaders/oreprocessing/ProcessingSand.java | 14 +- .../loaders/oreprocessing/ProcessingSaplings.java | 28 +- .../loaders/oreprocessing/ProcessingScrew.java | 28 +- .../loaders/oreprocessing/ProcessingShaping.java | 436 +++++----- .../loaders/oreprocessing/ProcessingSlab.java | 10 +- .../loaders/oreprocessing/ProcessingStick.java | 88 +- .../loaders/oreprocessing/ProcessingStickLong.java | 70 +- .../loaders/oreprocessing/ProcessingStone.java | 240 ++--- .../oreprocessing/ProcessingStoneCobble.java | 10 +- .../loaders/oreprocessing/ProcessingToolHead.java | 962 ++++++++++----------- .../loaders/oreprocessing/ProcessingToolOther.java | 108 ++- .../oreprocessing/ProcessingTransforming.java | 116 +-- .../loaders/oreprocessing/ProcessingWax.java | 16 +- .../loaders/oreprocessing/ProcessingWire.java | 282 +++--- 48 files changed, 2925 insertions(+), 2951 deletions(-) (limited to 'src/main/java/gregtech/loaders/oreprocessing') diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java index 2fb200216e..5a7316bfa3 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java @@ -1,15 +1,15 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; 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.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -25,9 +25,9 @@ public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegist return; } - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index b9926b188b..056feb0b33 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -4,21 +4,21 @@ import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; -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.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsBotania; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -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; public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -35,14 +35,14 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist } if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV - && GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + && GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { if (aMaterial == MaterialsBotania.Livingrock || aMaterial == MaterialsBotania.Livingwood || aMaterial == MaterialsBotania.Dreamwood) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( Materials.Water.getFluid( Math.max( @@ -52,11 +52,11 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( - GT_ModHandler.getDistilledWater( + GTModHandler.getDistilledWater( Math.max( 3, Math.min(750, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 426)))) @@ -64,9 +64,9 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( Materials.Lubricant.getFluid( Math.max( @@ -80,9 +80,9 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( Materials.Water.getFluid( Math.max( @@ -92,11 +92,11 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( - GT_ModHandler.getDistilledWater( + GTModHandler.getDistilledWater( Math.max( 3, Math.min(750, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 426)))) @@ -104,9 +104,9 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( Materials.Lubricant.getFluid( Math.max( @@ -118,18 +118,18 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist } } - ItemStack tStack1 = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L); - ItemStack tStack2 = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L); - ItemStack tStack3 = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L); + ItemStack tStack1 = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L); + ItemStack tStack2 = GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L); + ItemStack tStack3 = GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L); - GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1, aStack)); + GTModHandler.removeRecipeDelayed(GTUtility.copyAmount(1, aStack)); - if (tStack1 != null) GT_ModHandler + if (tStack1 != null) GTModHandler .removeRecipeDelayed(tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1); - if (tStack2 != null) GT_ModHandler + if (tStack2 != null) GTModHandler .removeRecipeDelayed(tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2); if (tStack3 != null) { - GT_ModHandler + GTModHandler .removeRecipeDelayed(tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3); } @@ -137,9 +137,9 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(1296L)) .duration(14 * SECONDS + 8 * TICKS) .eut(8) @@ -153,7 +153,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist if (tStack3 != null) tStack3.stackSize = 9; if (tStack2 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack) .itemOutputs(tStack2) .duration(5 * SECONDS) @@ -163,17 +163,17 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist if (tStack2 != null && aMaterial != Materials.NetherQuartz) { if (tStack3 != null) - GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); - GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) }); + GTModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); + GTModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) }); if (tStack1 != null) - GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) }); + GTModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) }); } if (!OrePrefixes.block.isIgnored(aMaterial) && tStack1 != null) { // 9 ingots -> 1 block - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) .duration(15 * SECONDS) .eut(calculateRecipeEU(aMaterial, 2)) .addTo(compressorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java index 0d28c417a8..3df65eb483 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java @@ -6,9 +6,9 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -35,9 +35,9 @@ public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistr return; } - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(2, aStack), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(2, aStack), + GTProxy.tBits, new Object[] { "s ", " X", 'X', OrePrefixes.stick.get(aMaterial) }); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index dcdbda4508..62c1c7cc5c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -1,14 +1,14 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.enums.GTValues.RA; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; import java.util.ArrayList; @@ -20,11 +20,11 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeBuilder; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; public class ProcessingCell implements IOreRecipeRegistrator { @@ -39,7 +39,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { switch (aPrefix) { case cell -> { if (aMaterial == Materials.Empty) { - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); if (aModName.equalsIgnoreCase("AtomicScience")) { RA.stdBuilder() .itemInputs(ItemList.Cell_Empty.get(1L)) @@ -50,15 +50,15 @@ public class ProcessingCell implements IOreRecipeRegistrator { } } else { if (aMaterial.mFuelPower > 0) { - GT_RecipeBuilder recipeBuilder = RA.stdBuilder(); - recipeBuilder.itemInputs(GT_Utility.copyAmount(1, aStack)); - if (GT_Utility.getFluidForFilledItem(aStack, true) == null - && GT_Utility.getContainerItem(aStack, true) != null) { - recipeBuilder.itemOutputs(GT_Utility.getContainerItem(aStack, true)); + GTRecipeBuilder recipeBuilder = RA.stdBuilder(); + recipeBuilder.itemInputs(GTUtility.copyAmount(1, aStack)); + if (GTUtility.getFluidForFilledItem(aStack, true) == null + && GTUtility.getContainerItem(aStack, true) != null) { + recipeBuilder.itemOutputs(GTUtility.getContainerItem(aStack, true)); } recipeBuilder.metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } if (!((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0))) { break; @@ -69,8 +69,8 @@ public class ProcessingCell implements IOreRecipeRegistrator { tAllAmount = (int) (tAllAmount + tMat2.mAmount); } long tItemAmount = 0L; - long tCapsuleCount = (long) GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize(aStack) * -tAllAmount; + long tCapsuleCount = (long) GTModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(aStack) + * -tAllAmount; long tDensityMultiplier = aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L : 1L; ArrayList tList = new ArrayList<>(); @@ -83,9 +83,9 @@ public class ProcessingCell implements IOreRecipeRegistrator { if (tMat.mMaterial == Materials.Air) { tStack = ItemList.Cell_Air.get(tMat.mAmount * tDensityMultiplier / 2L); } else { - tStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); + tStack = GTOreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); if (tStack == null) { - tStack = GT_OreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); + tStack = GTOreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); } } if (tItemAmount + tMat.mAmount * 3628800L > aStack.getMaxStackSize() * aMaterial.getDensity()) { @@ -100,15 +100,15 @@ public class ProcessingCell implements IOreRecipeRegistrator { tStack.stackSize = ((int) (tStack.stackSize * tDensityMultiplier)); while ((tStack.stackSize > 64) - && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L < 0L + && (tCapsuleCount + GTModHandler.getCapsuleCellContainerCount(tStack) * 64L < 0L ? tList.size() < 5 : tList.size() < 6) - && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L <= 64L)) { - tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L; - tList.add(GT_Utility.copyAmount(64, tStack)); + && (tCapsuleCount + GTModHandler.getCapsuleCellContainerCount(tStack) * 64L <= 64L)) { + tCapsuleCount += GTModHandler.getCapsuleCellContainerCount(tStack) * 64L; + tList.add(GTUtility.copyAmount(64, tStack)); tStack.stackSize -= 64; } - int tThisCapsuleCount = GT_ModHandler + int tThisCapsuleCount = GTModHandler .getCapsuleCellContainerCountMultipliedWithStackSize(tStack); if (tStack.stackSize > 0 && tCapsuleCount + tThisCapsuleCount <= 64L) { if (tCapsuleCount + tThisCapsuleCount < 0L ? tList.size() < 5 : tList.size() < 6) { @@ -118,7 +118,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { } } - tItemAmount = GT_Utility.ceilDiv(tItemAmount * tDensityMultiplier, aMaterial.getDensity()); + tItemAmount = GTUtility.ceilDiv(tItemAmount * tDensityMultiplier, aMaterial.getDensity()); if (tList.size() <= 0) { break; @@ -127,15 +127,15 @@ public class ProcessingCell implements IOreRecipeRegistrator { if ((aMaterial.mExtraData & 0x1) != 0) { // Electrolyzer recipe - if (GT_Utility.getFluidForFilledItem(aStack, true) == null) { + if (GTUtility.getFluidForFilledItem(aStack, true) == null) { // dust stuffed cell e.g. Phosphate, Phosphorous Pentoxide - GT_RecipeBuilder recipeBuilder = RA.stdBuilder(); + GTRecipeBuilder recipeBuilder = RA.stdBuilder(); if (tCapsuleCount > 0L) { recipeBuilder.itemInputs( - GT_Utility.copyAmount(tItemAmount, aStack), + GTUtility.copyAmount(tItemAmount, aStack), ItemList.Cell_Empty.get(tCapsuleCount)); } else { - recipeBuilder.itemInputs(GT_Utility.copyAmount(tItemAmount, aStack)); + recipeBuilder.itemInputs(GTUtility.copyAmount(tItemAmount, aStack)); } if (tCapsuleCount < 0L) { tList.add(ItemList.Cell_Empty.get(-tCapsuleCount)); @@ -147,7 +147,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { .addTo(electrolyzerRecipes); } else { long tCellBalance = tCapsuleCount + tItemAmount - 1; - GT_RecipeBuilder recipeBuilder = RA.stdBuilder(); + GTRecipeBuilder recipeBuilder = RA.stdBuilder(); if (tCellBalance > 0L) { recipeBuilder.itemInputs(aStack, ItemList.Cell_Empty.get(tCellBalance)); } else { @@ -164,13 +164,13 @@ public class ProcessingCell implements IOreRecipeRegistrator { } } if ((aMaterial.mExtraData & 0x2) != 0) { - GT_RecipeBuilder recipeBuilder = RA.stdBuilder(); + GTRecipeBuilder recipeBuilder = RA.stdBuilder(); if (tCapsuleCount > 0L) { recipeBuilder.itemInputs( - GT_Utility.copyAmount(tItemAmount, aStack), + GTUtility.copyAmount(tItemAmount, aStack), ItemList.Cell_Empty.get(tCapsuleCount)); } else { - recipeBuilder.itemInputs(GT_Utility.copyAmount(tItemAmount, aStack)); + recipeBuilder.itemInputs(GTUtility.copyAmount(tItemAmount, aStack)); } if (tCapsuleCount < 0L) { tList.add(ItemList.Cell_Empty.get(-tCapsuleCount)); @@ -185,257 +185,257 @@ public class ProcessingCell implements IOreRecipeRegistrator { } case cellPlasma -> { if (aMaterial == Materials.Empty) { - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); } else { - GT_RecipeBuilder recipeBuilder = RA.stdBuilder(); - recipeBuilder.itemInputs(GT_Utility.copyAmount(1, aStack)); - if (GT_Utility.getFluidForFilledItem(aStack, true) == null - && GT_Utility.getContainerItem(aStack, true) != null) { - recipeBuilder.itemOutputs(GT_Utility.getContainerItem(aStack, true)); + GTRecipeBuilder recipeBuilder = RA.stdBuilder(); + recipeBuilder.itemInputs(GTUtility.copyAmount(1, aStack)); + if (GTUtility.getFluidForFilledItem(aStack, true) == null + && GTUtility.getContainerItem(aStack, true) != null) { + recipeBuilder.itemOutputs(GTUtility.getContainerItem(aStack, true)); } // Switch case to set manual values for specific plasmas and escape the formula based on mass // when it doesn't make sense for powergen balance. switch (aMaterial.mName) { case "Aluminium" -> recipeBuilder.metadata(FUEL_VALUE, 159_744) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Americium" -> recipeBuilder.metadata(FUEL_VALUE, 501_760) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Antimony" -> recipeBuilder.metadata(FUEL_VALUE, 309_760) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Argon" -> recipeBuilder.metadata(FUEL_VALUE, 188_416) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Arsenic" -> recipeBuilder.metadata(FUEL_VALUE, 230_400) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Barium" -> recipeBuilder.metadata(FUEL_VALUE, 342_302) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Beryllium" -> recipeBuilder.metadata(FUEL_VALUE, 110_592) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Bismuth" -> recipeBuilder.metadata(FUEL_VALUE, 425_984) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Boron" -> recipeBuilder.metadata(FUEL_VALUE, 112_640) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Cadmium" -> recipeBuilder.metadata(FUEL_VALUE, 293_601) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Caesium" -> recipeBuilder.metadata(FUEL_VALUE, 332_513) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Calcium" -> recipeBuilder.metadata(FUEL_VALUE, 188_416) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Cerium" -> recipeBuilder.metadata(FUEL_VALUE, 346_931) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Chlorine" -> recipeBuilder.metadata(FUEL_VALUE, 172_032) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Chrome" -> recipeBuilder.metadata(FUEL_VALUE, 202_342) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Cobalt" -> recipeBuilder.metadata(FUEL_VALUE, 217_497) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Copper" -> recipeBuilder.metadata(FUEL_VALUE, 219_340) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Deuterium" -> recipeBuilder.metadata(FUEL_VALUE, 40_960) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Erbium" -> recipeBuilder.metadata(FUEL_VALUE, 376_217) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Europium" -> recipeBuilder.metadata(FUEL_VALUE, 355_635) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Fluorine" -> recipeBuilder.metadata(FUEL_VALUE, 147_456) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Force" -> recipeBuilder.metadata(FUEL_VALUE, 180_000) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Gadolinium" -> recipeBuilder.metadata(FUEL_VALUE, 366_551) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Gallium" -> recipeBuilder.metadata(FUEL_VALUE, 229_376) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Gold" -> recipeBuilder.metadata(FUEL_VALUE, 401_408) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Helium_3" -> recipeBuilder.metadata(FUEL_VALUE, 61_440) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Helium" -> recipeBuilder.metadata(FUEL_VALUE, 81_920) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Holmium" -> recipeBuilder.metadata(FUEL_VALUE, 376_176) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Hydrogen" -> recipeBuilder.metadata(FUEL_VALUE, 20_480) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Indium" -> recipeBuilder.metadata(FUEL_VALUE, 296_509) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Iridium" -> recipeBuilder.metadata(FUEL_VALUE, 397_148) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Iron" -> recipeBuilder.metadata(FUEL_VALUE, 206_438) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Lanthanum" -> recipeBuilder.metadata(FUEL_VALUE, 344_801) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Lead" -> recipeBuilder.metadata(FUEL_VALUE, 423_936) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Lithium" -> recipeBuilder.metadata(FUEL_VALUE, 100_352) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Lutetium" -> recipeBuilder.metadata(FUEL_VALUE, 381_296) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Magnesium" -> recipeBuilder.metadata(FUEL_VALUE, 152_371) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Manganese" -> recipeBuilder.metadata(FUEL_VALUE, 202_752) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Mercury" -> recipeBuilder.metadata(FUEL_VALUE, 409_600) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Molybdenum" -> recipeBuilder.metadata(FUEL_VALUE, 272_384) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Neodymium" -> recipeBuilder.metadata(FUEL_VALUE, 347_996) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Nickel" -> recipeBuilder.metadata(FUEL_VALUE, 213_811) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Niobium" -> recipeBuilder.metadata(FUEL_VALUE, 269_516) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Nitrogen" -> recipeBuilder.metadata(FUEL_VALUE, 129_024) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Osmium" -> recipeBuilder.metadata(FUEL_VALUE, 393_659) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Oxygen" -> recipeBuilder.metadata(FUEL_VALUE, 131_072) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Palladium" -> recipeBuilder.metadata(FUEL_VALUE, 282_214) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Phosphor" -> recipeBuilder.metadata(FUEL_VALUE, 165_888) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Platinum" -> recipeBuilder.metadata(FUEL_VALUE, 399_360) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Plutonium241" -> recipeBuilder.metadata(FUEL_VALUE, 497_664) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Plutonium" -> recipeBuilder.metadata(FUEL_VALUE, 503_808) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Potassium" -> recipeBuilder.metadata(FUEL_VALUE, 183_705) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Praseodymium" -> recipeBuilder.metadata(FUEL_VALUE, 346_931) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Promethium" -> recipeBuilder.metadata(FUEL_VALUE, 347_996) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Radon" -> recipeBuilder.metadata(FUEL_VALUE, 450_560) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Rubidium" -> recipeBuilder.metadata(FUEL_VALUE, 243_712) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Samarium" -> recipeBuilder.metadata(FUEL_VALUE, 353_280) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Scandium" -> recipeBuilder.metadata(FUEL_VALUE, 193_536) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Silicon" -> recipeBuilder.metadata(FUEL_VALUE, 160_563) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Silver" -> recipeBuilder.metadata(FUEL_VALUE, 282_685) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Sodium" -> recipeBuilder.metadata(FUEL_VALUE, 148_684) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Strontium" -> recipeBuilder.metadata(FUEL_VALUE, 249_446) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Sulfur" -> recipeBuilder.metadata(FUEL_VALUE, 170_393) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Tantalum" -> recipeBuilder.metadata(FUEL_VALUE, 384_000) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Terbium" -> recipeBuilder.metadata(FUEL_VALUE, 368_885) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Thorium" -> recipeBuilder.metadata(FUEL_VALUE, 471_040) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Thulium" -> recipeBuilder.metadata(FUEL_VALUE, 378_470) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Tin" -> recipeBuilder.metadata(FUEL_VALUE, 150_000) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Titanium" -> recipeBuilder.metadata(FUEL_VALUE, 196_608) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Tritium" -> recipeBuilder.metadata(FUEL_VALUE, 61_440) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Tungsten" -> recipeBuilder.metadata(FUEL_VALUE, 384_778) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Uranium235" -> recipeBuilder.metadata(FUEL_VALUE, 481_280) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Uranium" -> recipeBuilder.metadata(FUEL_VALUE, 487_424) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Vanadium" -> recipeBuilder.metadata(FUEL_VALUE, 198_451) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Ytterbium" -> recipeBuilder.metadata(FUEL_VALUE, 379_695) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Yttrium" -> recipeBuilder.metadata(FUEL_VALUE, 255_180) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "Zinc" -> recipeBuilder.metadata(FUEL_VALUE, 226_304) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); default -> recipeBuilder .metadata(FUEL_VALUE, (int) Math.max(1024L, 1024L * aMaterial.getMass())) .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } - if (GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null) { RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L)) + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L)) .duration(((int) Math.max(aMaterial.getMass() * 2L, 1L)) * TICKS) .eut(TierEU.RECIPE_MV) .addTo(vacuumFreezerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index c2a68c5bc2..bca59a3543 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -18,13 +18,13 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals(GregTech.ID)) return; + if (GTOreDictUnificator.isBlacklisted(aStack) && aModName.equals(GregTech.ID)) return; switch (aMaterial.mName) { case "Good", "Data", "Elite", "Master", "Ultimate", "Superconductor", "Infinite", "Bio" -> { - if (!GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals(GregTech.ID)) - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + if (!GTOreDictUnificator.isBlacklisted(aStack) && !aModName.equals(GregTech.ID)) + GTModHandler.removeRecipeByOutputDelayed(aStack); } - case "Primitive", "Basic", "Advanced" -> GT_ModHandler.removeRecipeByOutputDelayed(aStack); + case "Primitive", "Basic", "Advanced" -> GTModHandler.removeRecipeByOutputDelayed(aStack); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java index 4ef818df5b..00f901b6be 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java @@ -2,12 +2,12 @@ package gregtech.loaders.oreprocessing; import net.minecraft.item.ItemStack; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; public class ProcessingCompressed implements IOreRecipeRegistrator { @@ -18,8 +18,8 @@ public class ProcessingCompressed implements IOreRecipeRegistrator { @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_ModHandler.removeRecipeByOutputDelayed(aStack); - GregTech_API + GTModHandler.removeRecipeByOutputDelayed(aStack); + GregTechAPI .registerCover(aStack, TextureFactory.of(aMaterial.mIconSet.mTextures[72], aMaterial.mRGBa, false), null); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index 200ce743c9..861694e35a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -5,22 +5,22 @@ import static gregtech.api.enums.Mods.BuildCraftSilicon; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.WaferEngravingRecipes; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.WaferEngravingRecipes; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -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 ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -34,8 +34,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg ItemStack aStack) { switch (aOreDictName) { case "craftingQuartz" -> { - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.redstone_torch, 3, 32767), GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.redstone_torch, 3, 32767), GTUtility.copyAmount(1, aStack)) .itemOutputs(new ItemStack(net.minecraft.init.Items.comparator, 1, 0)) .fluidInputs(Materials.Concrete.getMolten(144L)) .duration(2 * SECONDS) @@ -44,58 +44,58 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg } case "craftingLensBlue" -> { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), - GT_Utility.copyAmount(0, aStack)) - .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13)) + GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), - GT_Utility.copyAmount(0, aStack)) - .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13)) + GTOreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.IC2_LapotronCrystal.getWildcard(1L), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.IC2_LapotronCrystal.getWildcard(1L), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L)) .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Chip_CrystalCPU.get(1L), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Chip_CrystalCPU.get(1L), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Chip_CrystalSoC.get(1)) .requiresCleanRoom() .duration(30 * SECONDS) .eut(40000) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_PIC.get(1)) .requiresCleanRoom() .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(WaferEngravingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_PIC.get(4)) .requiresCleanRoom() .duration(40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(WaferEngravingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_QPIC.get(1)) .requiresCleanRoom() .duration(2 * MINUTES) @@ -105,57 +105,57 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg } case "craftingLensYellow" -> { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), - GT_Utility.copyAmount(0, aStack)) - .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14)) + GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), - GT_Utility.copyAmount(0, aStack)) - .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14)) + GTOreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_LPIC.get(1)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(WaferEngravingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GTUtility.copyAmount(0, aStack))