diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
48 files changed, 2925 insertions, 2951 deletions
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<ItemStack> 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)) .itemOutputs(ItemList.Circuit_Wafer_LPIC.get(4)) .requiresCleanRoom() .duration(30 * 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_SoC.get(1)) .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(WaferEngravingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC.get(4)) .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_IV) .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_SoC.get(8)) .requiresCleanRoom() .duration(15 * SECONDS) @@ -164,29 +164,29 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg } case "craftingLensOrange" -> { - 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_Simple_SoC.get(1)) .duration(15 * SECONDS) .eut(64) .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)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(4)) .duration(15 * SECONDS) .eut(256) .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_Simple_SoC.get(16)) .duration(15 * SECONDS) .eut(1024) .addTo(WaferEngravingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(64)) .duration(15 * SECONDS) .eut(4096) @@ -195,57 +195,57 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg } case "craftingLensCyan" -> { - 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, 15)) + GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15)) .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, 15)) + GTOreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15)) .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_Ram.get(1)) .duration(60 * 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)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(4)) .requiresCleanRoom() .duration(45 * 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_Ram.get(8)) .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(WaferEngravingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(16)) .requiresCleanRoom() .duration(15 * SECONDS) .eut(TierEU.RECIPE_IV) .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_Ram.get(32)) .requiresCleanRoom() .duration(7 * SECONDS + 10 * TICKS) @@ -255,57 +255,57 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg } case "craftingLensRed" -> { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), - GT_Utility.copyAmount(0, aStack)) - .itemOutputs(GT_ModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), - GT_Utility.copyAmount(0, aStack)) - .itemOutputs(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0)) + GTOreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0)) .duration(10 * SECONDS) .eut(16) .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_ILC.get(1)) .duration(60 * 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)) .itemOutputs(ItemList.Circuit_Wafer_ILC.get(4)) .requiresCleanRoom() .duration(45 * 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_ILC.get(8)) .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(WaferEngravingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_NPIC.get(1)) .requiresCleanRoom() .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_LuV) .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_NPIC.get(4)) .requiresCleanRoom() .duration(1 * MINUTES + 15 * SECONDS) @@ -315,54 +315,54 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg } case "craftingLensGreen" -> { - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Chip_CrystalCPU.get(1)) .requiresCleanRoom() .duration(30 * SECONDS) .eut(10000) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Chip_CrystalSoC.get(1L), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Chip_CrystalSoC.get(1L), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Chip_CrystalSoC2.get(1)) .requiresCleanRoom() .duration(60 * SECONDS) .eut(80000) .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_ULPIC.get(2)) .duration(30 * SECONDS) .eut(30) .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)) .itemOutputs(ItemList.Circuit_Wafer_ULPIC.get(8)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) .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_SoC2.get(1)) .requiresCleanRoom() .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(WaferEngravingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC2.get(2)) .requiresCleanRoom() .duration(1 * MINUTES + 15 * SECONDS) .eut(TierEU.RECIPE_IV) .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_SoC2.get(4)) .requiresCleanRoom() .duration(60 * SECONDS) @@ -371,88 +371,88 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg } case "craftingLensWhite" -> { - 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, 19)) + GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19)) .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, 19)) + GTOreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GTUtility.copyAmount(0, aStack)) .itemOutputs(new ItemStack(Blocks.sandstone, 1, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.stone, 1, 0), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.stone, 1, 0), GTUtility.copyAmount(0, aStack)) .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 3)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.quartz_block, 1, 0), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.quartz_block, 1, 0), GTUtility.copyAmount(0, aStack)) .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L), - GT_Utility.copyAmount(0, aStack)) - .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L)) + GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L), + GTUtility.copyAmount(0, aStack)) + .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) .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_CPU.get(1)) .requiresCleanRoom() .duration(60 * 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)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(4)) .requiresCleanRoom() .duration(45 * 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_CPU.get(8)) .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(WaferEngravingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(16)) .requiresCleanRoom() .duration(15 * SECONDS) .eut(TierEU.RECIPE_IV) .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_CPU.get(32)) .requiresCleanRoom() .duration(7 * SECONDS + 10 * TICKS) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index 92b5ae9cda..b4db15db42 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -5,19 +5,20 @@ import static gregtech.api.recipe.RecipeMaps.brewingRecipes; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.slicerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -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.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -29,8 +30,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, net.minecraft.item.ItemStack aStack) { // Compressor recipes - GT_Values.RA.stdBuilder() - .itemInputs(gregtech.api.util.GT_Utility.copyAmount(8, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(8, aStack)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) .duration(15 * SECONDS) .eut(2) @@ -39,7 +40,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr Fluid[] waterArray; if (IndustrialCraft2.isModLoaded()) { - waterArray = new Fluid[] { FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L) + waterArray = new Fluid[] { FluidRegistry.WATER, GTModHandler.getDistilledWater(1L) .getFluid() }; } else { waterArray = new Fluid[] { FluidRegistry.WATER }; @@ -48,7 +49,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr switch (aOreDictName) { case "cropTea" -> { for (Fluid tFluid : waterArray) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack) .fluidInputs(new FluidStack(tFluid, 750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.tea"), 750)) @@ -59,7 +60,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr } case "cropGrape" -> { for (Fluid tFluid : waterArray) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack) .fluidInputs(new FluidStack(tFluid, 750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.grapejuice"), 750)) @@ -68,27 +69,27 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .addTo(brewingRecipes); } } - case "cropChilipepper" -> GT_Values.RA.stdBuilder() + case "cropChilipepper" -> GTValues.RA.stdBuilder() .itemInputs(aStack) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - case "cropCoffee" -> GT_Values.RA.stdBuilder() + case "cropCoffee" -> GTValues.RA.stdBuilder() .itemInputs(aStack) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); case "cropPotato" -> { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Raw_PotatoChips.get(1L)) .duration(3 * SECONDS + 4 * TICKS) .eut(4) .addTo(slicerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Stripes.get(0L)) .itemOutputs(ItemList.Food_Raw_Fries.get(1L)) .duration(3 * SECONDS + 4 * TICKS) @@ -96,7 +97,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .addTo(slicerRecipes); for (Fluid tFluid : waterArray) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack) .fluidInputs(new FluidStack(tFluid, 750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.potatojuice"), 750)) @@ -106,7 +107,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr } } case "cropLemon" -> { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Lemon.get(4L)) .duration(3 * SECONDS + 4 * TICKS) @@ -114,7 +115,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .addTo(slicerRecipes); for (Fluid tFluid : waterArray) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack) .fluidInputs(new FluidStack(tFluid, 750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.lemonjuice"), 750)) @@ -123,7 +124,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .addTo(brewingRecipes); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack) .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.leninade"), 750)) @@ -131,19 +132,19 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .eut(4) .addTo(brewingRecipes); } - case "cropTomato" -> GT_Values.RA.stdBuilder() + case "cropTomato" -> GTValues.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Tomato.get(4L)) .duration(3 * SECONDS + 4 * TICKS) .eut(4) .addTo(slicerRecipes); - case "cropCucumber" -> GT_Values.RA.stdBuilder() + case "cropCucumber" -> GTValues.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Cucumber.get(4L)) .duration(3 * SECONDS + 4 * TICKS) .eut(4) .addTo(slicerRecipes); - case "cropOnion" -> GT_Values.RA.stdBuilder() + case "cropOnion" -> GTValues.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Onion.get(4L)) .duration(3 * SECONDS + 4 * TICKS) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index a730a1849b..ed80d04e99 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -4,16 +4,16 @@ import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.sifterRecipes; import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; 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 ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -27,20 +27,20 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR ItemStack aStack) { switch (aPrefix) { case crushedCentrifuged -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) .duration(10 * TICKS) .eut(16) .addTo(hammerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get( + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GTOreDictUnificator.get( OrePrefixes.dust, - GT_Utility.selectItemInList(2, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + GTUtility.selectItemInList(2, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)) .outputChances(10000, 1000) .duration(20 * SECONDS) @@ -48,52 +48,52 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR .addTo(maceratorRecipes); } case crushedPurified -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.crushedCentrifuged, aMaterial.mMacerateInto, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), 1L), - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.dust, - GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + GTUtility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)) .outputChances(10000, 1111) .duration(25 * SECONDS) .eut(48) .addTo(thermalCentrifugeRecipes); - ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L); + ItemStack tGem = GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L); if (tGem == null) { break; } switch (aMaterial.mName) { - case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GT_Values.RA + case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GTValues.RA .stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), + GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L)) + GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GTOreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L)) .outputChances(300, 1200, 4500, 1400, 2800, 3500) .duration(40 * SECONDS) .eut(16) .addTo(sifterRecipes); - default -> GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + default -> GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), + GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L)) + GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GTOreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L)) .outputChances(100, 400, 1500, 2000, 4000, 5000) .duration(40 * SECONDS) .eut(16) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java index ec8fd12a74..435573420d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java @@ -2,16 +2,16 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; 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 ProcessingCrystallized implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -27,20 +27,20 @@ public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecip return; } - if (GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1) == null) { + if (GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1) == null) { return; } - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) .duration(10 * TICKS) .eut(16) .addTo(hammerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index ed152fc47f..a09cc2ca44 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -1,22 +1,22 @@ 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.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; +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.enums.SubTag; -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 ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -30,24 +30,24 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, net.minecraft.item.ItemStack aStack) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L)) .duration(10) .eut(16) .addTo(hammerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.dustImpure, aMaterial.mMacerateInto, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), 1L), - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.dust, - GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + GTUtility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)) .outputChances(10000, 1000) .duration(20 * SECONDS) @@ -55,52 +55,52 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .addTo(maceratorRecipes); RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get( + GTOreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, aMaterial, 1L), - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.dust, - GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + GTUtility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(100_00, 11_11, 100_00) - .fluidInputs(GT_ModHandler.getWater(1000)) + .fluidInputs(GTModHandler.getWater(1000)) .duration(25 * SECONDS) .eut(16) .addTo(oreWasherRecipes); RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get( + GTOreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, aMaterial, 1L), - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.dust, - GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + GTUtility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(100_00, 11_11, 100_00) - .fluidInputs(GT_ModHandler.getDistilledWater(200)) + .fluidInputs(GTModHandler.getDistilledWater(200)) .duration(15 * SECONDS) .eut(16) .addTo(oreWasherRecipes); OrePrefixes prefix = aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedCentrifuged : OrePrefixes.dust; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(prefix, aMaterial, 1L), - GT_OreDictUnificator.get( + GTOreDictUnificator.get(prefix, aMaterial, 1L), + GTOreDictUnificator.get( OrePrefixes.dust, - GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + GTUtility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 1111, 10000) .duration(25 * SECONDS) .eut(48) @@ -118,12 +118,12 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist : OrePrefixes.dustPure; if (byproduct.contains(SubTag.WASHING_MERCURY)) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, stack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, stack)) .itemOutputs( - GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) + GTOreDictUnificator.get(chemicalBathPrefix, material, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 7000, 4000) .fluidInputs(Materials.Mercury.getFluid(1000L)) .duration(40 * SECONDS) @@ -131,12 +131,12 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .addTo(chemicalBathRecipes); } if (byproduct.contains(SubTag.WASHING_MERCURY_99_PERCENT)) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, stack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, stack)) .itemOutputs( - GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) + GTOreDictUnificator.get(chemicalBathPrefix, material, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 9900, 4000) .fluidInputs(Materials.Mercury.getFluid(1000L)) .duration(40 * SECONDS) @@ -144,12 +144,12 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .addTo(chemicalBathRecipes); } if (byproduct.contains(SubTag.WASHING_SODIUMPERSULFATE)) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, stack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, stack)) .itemOutputs( - GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) + GTOreDictUnificator.get(chemicalBathPrefix, material, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 7000, 4000) .fluidInputs(Materials.SodiumPersulfate.getFluid(100L)) .duration(40 * SECONDS) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index c8a3af1130..3398fda98d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -9,12 +9,12 @@ import static gregtech.api.recipe.RecipeMaps.electroMagneticSeparatorRecipes; import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; import static gregtech.api.recipe.RecipeMaps.implosionRecipes; import static gregtech.api.recipe.RecipeMaps.packagerRecipes; -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.COIL_HEAT; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; +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.COIL_HEAT; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; import java.util.ArrayList; @@ -22,7 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -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.MaterialsUEVplus; @@ -30,12 +30,12 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; 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_RecipeRegistrator; -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.GTRecipeRegistrator; +import gregtech.api.util.GTUtility; public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -54,26 +54,26 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr switch (aPrefix) { case dust -> { if (aMaterial.mFuelPower > 0) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } - if ((GT_Utility.getFluidForFilledItem(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), true) - == null) && (GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null)) { - GT_Values.RA.stdBuilder() + if ((GTUtility.getFluidForFilledItem(GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), true) + == null) && (GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null)) { + GTValues.RA.stdBuilder() .itemInputs(aStack, ItemList.Cell_Empty.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L)) .duration(5 * SECONDS) .eut(1) .addTo(cannerRecipes); } if (!aMaterial.mBlastFurnaceRequired) { - GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); + GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { - GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1, aStack), + GTRecipeRegistrator.registerReverseArcSmelting( + GTUtility.copyAmount(1, aStack), aMaterial, aPrefix.mMaterialAmount, null, @@ -82,20 +82,20 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } ItemStack tDustStack; - if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) + if ((null != (tDustStack = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) && (!aMaterial.contains(SubTag.NO_SMELTING))) { if (aMaterial.mBlastFurnaceRequired) { - GT_ModHandler.removeFurnaceSmelting(aStack); + GTModHandler.removeFurnaceSmelting(aStack); if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { - GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); + GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); recipeBuilder - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)); + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)); if (aMaterial.mBlastFurnaceTemp > 1750) { recipeBuilder.itemOutputs( - GT_OreDictUnificator + GTOreDictUnificator .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L)); } else { - recipeBuilder.itemOutputs(GT_Utility.copyAmount(1, tDustStack)); + recipeBuilder.itemOutputs(GTUtility.copyAmount(1, tDustStack)); } recipeBuilder .duration( @@ -105,23 +105,23 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .addTo(blastFurnaceRecipes); } } else { - GT_ModHandler.addSmeltingRecipe(aStack, tDustStack); + GTModHandler.addSmeltingRecipe(aStack, tDustStack); } } else if (!aMaterial.contains(SubTag.NO_WORKING)) { if ((!OrePrefixes.block.isIgnored(aMaterial)) - && (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) - && GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) { + && (null == GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) + && GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) .duration(15 * SECONDS) .eut(2) .addTo(compressorRecipes); } // This is so disgustingly bad. if (((OrePrefixes.block.isIgnored(aMaterial)) - || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) + || (null == GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Basalt) @@ -134,10 +134,10 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && (aMaterial != Materials.Clay)) { // compressor recipe { - if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .duration(15 * SECONDS) .eut(2) .addTo(compressorRecipes); @@ -155,9 +155,9 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if (tMat.mMaterial == Materials.Air) { tDustStack = ItemList.Cell_Air.get(tMat.mAmount / 2L); } else { - tDustStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); + tDustStack = GTOreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); if (tDustStack == null) - tDustStack = GT_OreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); + tDustStack = GTOreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); } if (tItemAmount + tMat.mAmount * 3628800L <= aStack.getMaxStackSize() * aMaterial.getDensity()) { @@ -165,17 +165,17 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if (tDustStack != null) { tDustStack.stackSize = ((int) (tDustStack.stackSize * tDensityMultiplier)); while ((tDustStack.stackSize > 64) && (tList.size() < 6) - && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64L + && (tCapsuleCount + GTModHandler.getCapsuleCellContainerCount(tDustStack) * 64L <= 64L)) { - tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64L; - tList.add(GT_Utility.copyAmount(64, tDustStack)); + tCapsuleCount += GTModHandler.getCapsuleCellContainerCount(tDustStack) * 64L; + tList.add(GTUtility.copyAmount(64, tDustStack)); tDustStack.stackSize -= 64; } if ((tDustStack.stackSize > 0) && (tList.size() < 6) && (tCapsuleCount - + GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack) + + GTModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack) <= 64L)) { - tCapsuleCount += GT_ModHandler + tCapsuleCount += GTModHandler .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack); tList.add(tDustStack); } @@ -189,9 +189,9 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr int tList_sS = tList.size(); for (int i = 0; i < tList_sS; i++) { if ((!ItemList.Cell_Air.isStackEqual(tList.get(i))) - && ((tFluid = GT_Utility.getFluidForFilledItem(tList.get(i), true)) != null)) { + && ((tFluid = GTUtility.getFluidForFilledItem(tList.get(i), true)) != null)) { tFluid.amount *= tList.get(i).stackSize; - tCapsuleCount -= GT_ModHandler + tCapsuleCount -= GTModHandler .getCapsuleCellContainerCountMultipliedWithStackSize(tList.get(i)); tList.remove(i); break; @@ -199,13 +199,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } if ((aMaterial.mExtraData & 0x1) != 0) { if (tList.size() > 0 || tFluid != null) { - GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); + GTRecipeBuilder recipeBuilder = GTValues.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 (tList.size() > 0) { ItemStack[] outputsArray = tList.toArray(new ItemStack[Math.min(tList.size(), 6)]); @@ -222,13 +222,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } if ((aMaterial.mExtraData & 0x2) != 0) { if (tList.size() > 0 || tFluid != null) { - GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); + GTRecipeBuilder recipeBuilder = GTValues.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 (tList.size() > 0) { ItemStack[] outputsArray = tList.toArray(new ItemStack[Math.min(tList.size(), 6)]); @@ -245,26 +245,26 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } if (aMaterial.contains(SubTag.CRYSTALLISABLE) - && GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) + && GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(7000) .fluidInputs(Materials.Water.getFluid(200L)) .duration(1 * MINUTES + 40 * SECONDS) .eut(24) .addTo(autoclaveRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(9000) - .fluidInputs(GT_ModHandler.getDistilledWater(100L)) + .fluidInputs(GTModHandler.getDistilledWater(100L)) .duration(1 * MINUTES + 15 * SECONDS) .eut(24) .addTo(autoclaveRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) .duration(1 * MINUTES) @@ -275,65 +275,63 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr case "NULL", "Mercury", "Coal": break; case "Glass": - GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addSmeltingRecipe( + GTUtility.copyAmount(1, aStack), new ItemStack(net.minecraft.init.Blocks.glass)); break; case "NetherQuartz": case "Quartz": case "CertusQuartz": - GT_ModHandler.removeFurnaceSmelting(aStack); + GTModHandler.removeFurnaceSmelting(aStack); break; case "MeatRaw": - GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L)); + GTModHandler.addSmeltingRecipe( + GTUtility.copyAmount(1, aStack), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L)); break; case "Oilsands": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .fluidOutputs(Materials.OilHeavy.getFluid(1000)) .duration(33 * SECONDS) .eut(8) .addTo(centrifugeRecipes); break; case "HydratedCoal": - GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)); + GTModHandler.addSmeltingRecipe( + GTUtility.copyAmount(1, aStack), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)); break; case "Diamond": { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(64)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(64)) .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(4, aStack), - GT_ModHandler.getIC2Item("dynamite", 16, null)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("dynamite", 16, null)) .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 32)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 32)) .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), GT_ModHandler.getIC2Item("industrialTnt", 8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("industrialTnt", 8)) .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); @@ -349,37 +347,35 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr case "BlueTopaz": case "Tanzanite": case "Amethyst": { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(48)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(48)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(4, aStack), - GT_ModHandler.getIC2Item("dynamite", 12, null)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("dynamite", 12, null)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 24)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 24)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), GT_ModHandler.getIC2Item("industrialTnt", 6)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("industrialTnt", 6)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); @@ -394,35 +390,35 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr case "Forcicium": case "Forcillium": case "Force": { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(32)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(32)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), GT_ModHandler.getIC2Item("dynamite", 8, null)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("dynamite", 8, null)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 16)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 16)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), GT_ModHandler.getIC2Item("industrialTnt", 4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("industrialTnt", 4)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); @@ -430,42 +426,42 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } case dustPure, dustImpure, dustRefined -> { - Materials tByProduct = GT_Utility.selectItemInList( + Materials tByProduct = GTUtility.selectItemInList( aPrefix == OrePrefixes.dustRefined ? 2 : aPrefix == OrePrefixes.dustPure ? 1 : 0, aMaterial, aMaterial.mOreByProducts); if (aPrefix == OrePrefixes.dustPure) { if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_GOLD)) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gold, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L)) .outputChances(10000, 4000, 2000) .duration(20 * SECONDS) .eut(24) .addTo(electroMagneticSeparatorRecipes); } if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_IRON)) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L)) .outputChances(10000, 4000, 2000) .duration(20 * SECONDS) .eut(24) .addTo(electroMagneticSeparatorRecipes); } if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM)) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neodymium, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1L), + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Neodymium, 1L)) .outputChances(10000, 4000, 2000) .duration(20 * SECONDS) .eut(24) @@ -473,70 +469,70 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } if (aMaterial.contains(SubTag.CRYSTALLISABLE) - && GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) + && GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(9000) .fluidInputs(Materials.Water.getFluid(200L)) .duration(1 * MINUTES + 40 * SECONDS) .eut(24) .addTo(autoclaveRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(9500) - .fluidInputs(GT_ModHandler.getDistilledWater(100L)) + .fluidInputs(GTModHandler.getDistilledWater(100L)) .duration(1 * MINUTES + 15 * SECONDS) .eut(24) .addTo(autoclaveRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) .duration(1 * MINUTES) .eut(24) .addTo(autoclaveRecipes); } - ItemStack tImpureStack = GT_OreDictUnificator.get( + ItemStack tImpureStack = GTOreDictUnificator.get( OrePrefixes.dustTiny, tByProduct, - GT_OreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L), + GTOreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L), 1L); if (tImpureStack == null) { - tImpureStack = GT_OreDictUnificator.get(OrePrefixes.dustSmall, tByProduct, 1L); + tImpureStack = GTOreDictUnificator.get(OrePrefixes.dustSmall, tByProduct, 1L); if (tImpureStack == null) { - tImpureStack = GT_OreDictUnificator.get( + tImpureStack = GTOreDictUnificator.get( OrePrefixes.dust, tByProduct, - GT_OreDictUnificator.get(OrePrefixes.gem, tByProduct, 1L), + GTOreDictUnificator.get(OrePrefixes.gem, tByProduct, 1L), 1L); if (tImpureStack == null) { - tImpureStack = GT_OreDictUnificator.get(OrePrefixes.cell, tByProduct, 1L); + tImpureStack = GTOreDictUnificator.get(OrePrefixes.cell, tByProduct, 1L); if (tImpureStack == null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) .duration(Math.max(1L, aMaterial.getMass())) .eut(5) .addTo(centrifugeRecipes); } else { - FluidStack tFluid = GT_Utility.getFluidForFilledItem(tImpureStack, true); + FluidStack tFluid = GTUtility.getFluidForFilledItem(tImpureStack, true); if (tFluid == null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Cell_Empty.get(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Cell_Empty.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), tImpureStack) .duration(Math.max(1L, aMaterial.getMass() * 72L)) .eut(5) .addTo(centrifugeRecipes); } else { tFluid.amount /= 10; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) .fluidOutputs(tFluid) .duration(Math.max(1L, aMaterial.getMass() * 8L)) .eut(5) @@ -544,30 +540,30 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } } else { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), tImpureStack) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), tImpureStack) .duration(Math.max(1L, aMaterial.getMass() * 72L)) .eut(5) .addTo(centrifugeRecipes); } } else { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), tImpureStack) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), tImpureStack) .duration(Math.max(1L, aMaterial.getMass() * 16L)) .eut(5) .addTo(centrifugeRecipes); } } else { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_OreDictUnificator.get( + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GTOreDictUnificator.get( OrePrefixes.dust, tByProduct, - GT_OreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L), + GTOreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L), 1L)) .outputChances(10000, 1111) .duration(Math.max(1L, aMaterial.getMass() * 8L)) @@ -576,17 +572,17 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } case dustSmall -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Schematic_Dust.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Schematic_Dust.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) .duration(1 * SECONDS) .eut(4) .addTo(packagerRecipes); if (!aMaterial.mBlastFurnaceRequired) { - GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); + GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { - GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1, aStack), + GTRecipeRegistrator.registerReverseArcSmelting( + GTUtility.copyAmount(1, aStack), aMaterial, aPrefix.mMaterialAmount, null, @@ -596,17 +592,17 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } case dustTiny -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Schematic_Dust.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Schematic_Dust.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) .duration(1 * SECONDS) .eut(4) .addTo(packagerRecipes); if (!aMaterial.mBlastFurnaceRequired) { - GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); + GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { - GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1, aStack), + GTRecipeRegistrator.registerReverseArcSmelting( + GTUtility.copyAmount(1, aStack), aMaterial, aPrefix.mMaterialAmount, null, @@ -616,7 +612,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } if (!aMaterial.contains(SubTag.NO_SMELTING)) { if (aMaterial.mBlastFurnaceRequired) { - GT_ModHandler.removeFurnaceSmelting(aStack); + GTModHandler.removeFurnaceSmelting(aStack); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java index 9661033e6a..5c2be8a785 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java @@ -1,12 +1,12 @@ 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.alloySmelterRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.WILDCARD; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import java.util.Locale; @@ -15,13 +15,13 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import gregtech.api.enums.Dyes; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IOreRecipeRegistrator; -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 ProcessingDye implements IOreRecipeRegistrator { @@ -33,7 +33,7 @@ public class ProcessingDye implements IOreRecipeRegistrator { public void registerOre(OrePrefixes prefix, Materials material, String oreDictName, String modName, ItemStack stack) { Dyes aDye = Dyes.get(oreDictName); - if ((aDye.mIndex >= 0) && (aDye.mIndex < 16) && (GT_Utility.getContainerItem(stack, true) == null)) { + if ((aDye.mIndex >= 0) && (aDye.mIndex < 16) && (GTUtility.getContainerItem(stack, true) == null)) { registerAlloySmelter(stack, aDye); registerMixer(stack, aDye); registerChemicalReactor(stack, aDye); @@ -44,17 +44,17 @@ public class ProcessingDye implements IOreRecipeRegistrator { String fluidName = "dye.watermixed." + dye.name() .toLowerCase(Locale.ENGLISH); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, stack), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, stack), GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Water.getFluid(216L)) .fluidOutputs(FluidRegistry.getFluidStack(fluidName, 192)) .duration(16 * TICKS) .eut(4) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, stack), GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(GT_ModHandler.getDistilledWater(288L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, stack), GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GTModHandler.getDistilledWater(288L)) .fluidOutputs(FluidRegistry.getFluidStack(fluidName, 216)) .duration(16 * TICKS) .eut(4) @@ -63,16 +63,14 @@ public class ProcessingDye implements IOreRecipeRegistrator { public void registerAlloySmelter(ItemStack stack, Dyes dye) { RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 8L), - GT_Utility.copyAmount(1, stack)) + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 8L), GTUtility.copyAmount(1, stack)) .itemOutputs(new ItemStack(Blocks.stained_glass, 8, 15 - dye.mIndex)) .duration(10 * SECONDS) .eut(8) .addTo(alloySmelterRecipes); RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.glass, 8, WILDCARD), GT_Utility.copyAmount(1, stack)) + .itemInputs(new ItemStack(Blocks.glass, 8, WILDCARD), GTUtility.copyAmount(1, stack)) .itemOutputs(new ItemStack(Blocks.stained_glass, 8, 15 - dye.mIndex)) .duration(10 * SECONDS) .eut(8) @@ -83,8 +81,8 @@ public class ProcessingDye implements IOreRecipeRegistrator { String fluidName = "dye.chemical." + dye.name() .toLowerCase(Locale.ENGLISH); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, stack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, stack), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 2)) .fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(FluidRegistry.getFluidStack(fluidName, 288)) .duration(30 * SECONDS) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java index cfd33f1ace..a9c40975e8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java @@ -5,10 +5,10 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_RecipeRegistrator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTRecipeRegistrator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingFineWire implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -20,13 +20,13 @@ public class ProcessingFineWire implements gregtech.api.interfaces.IOreRecipeReg public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { - GT_RecipeRegistrator.registerWiremillRecipes(aMaterial, 100, 4); + GTRecipeRegistrator.registerWiremillRecipes(aMaterial, 100, 4); } if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(1, aStack), + GTProxy.tBits, new Object[] { "Xx", 'X', OrePrefixes.foil.get(aMaterial) }); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java index 9b46710b71..3839c38c66 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java @@ -1,18 +1,18 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.benderRecipes; -import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import static gregtech.api.util.GTUtility.calculateRecipeEU; import net.minecraft.item.ItemStack; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; 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_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class ProcessingFoil implements IOreRecipeRegistrator { @@ -28,18 +28,18 @@ public class ProcessingFoil implements IOreRecipeRegistrator { } private void registerBenderRecipe(Materials material) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(1, GT_OreDictUnificator.get(OrePrefixes.plate, material, 4L)), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.foil, material, 4L)) + GTUtility.copyAmount(1, GTOreDictUnificator.get(OrePrefixes.plate, material, 4L)), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.foil, material, 4L)) .duration((int) Math.max(material.getMass(), 1L)) .eut(calculateRecipeEU(material, 24)) .addTo(benderRecipes); } private void registerCover(ItemStack stack, Materials material) { - GregTech_API + GregTechAPI .registerCover(stack, TextureFactory.of(material.mIconSet.mTextures[70], material.mRGBa, false), null); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java index e7fc25038f..0c8119ded3 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java @@ -4,18 +4,18 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.formingPressRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.slicerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; 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.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 ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -29,10 +29,10 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr switch (aOreDictName) { case "foodCheese" -> { registerSlicerRecipes(aStack); - GT_OreDictUnificator.addItemData(aStack, new gregtech.api.objects.ItemData(Materials.Cheese, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new gregtech.api.objects.ItemData(Materials.Cheese, 3628800L)); } case "foodDough" -> { - GT_ModHandler.removeFurnaceSmelting(aStack); + GTModHandler.removeFurnaceSmelting(aStack); registerBenderRecipes(aStack); registerMixerRecipes(aStack); registerFormingPressRecipes(aStack); @@ -41,7 +41,7 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr } private void registerSlicerRecipes(ItemStack stack) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(stack, ItemList.Shape_Slicer_Flat.get(0L)) .itemOutputs(ItemList.Food_Sliced_Cheese.get(4L)) .duration(3 * SECONDS + 4 * TICKS) @@ -50,8 +50,8 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr } private void registerBenderRecipes(ItemStack stack) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, stack), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, stack), GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Food_Flat_Dough.get(1L)) .duration(16 * TICKS) .eut(4) @@ -59,22 +59,22 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr } private void registerMixerRecipes(ItemStack stack) { - GT_Values.RA.stdBuilder() - .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(stack, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) .itemOutputs(ItemList.Food_Dough_Sugar.get(2L)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(stack, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) .itemOutputs(ItemList.Food_Dough_Chocolate.get(2L)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chocolate, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(stack, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chocolate, 1L)) .itemOutputs(ItemList.Food_Dough_Chocolate.get(2L)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) @@ -83,22 +83,22 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr private void registerFormingPressRecipes(ItemStack stack) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, stack), ItemList.Shape_Mold_Bun.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, stack), ItemList.Shape_Mold_Bun.get(0L)) .itemOutputs(ItemList.Food_Raw_Bun.get(1L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) .addTo(formingPressRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, stack), ItemList.Shape_Mold_Bread.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, stack), ItemList.Shape_Mold_Bread.get(0L)) .itemOutputs(ItemList.Food_Raw_Bread.get(1L)) .duration(12 * SECONDS + 16 * TICKS) .eut(4) .addTo(formingPressRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, stack), ItemList.Shape_Mold_Baguette.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, stack), ItemList.Shape_Mold_Baguette.get(0L)) .itemOutputs(ItemList.Food_Raw_Baguette.get(1L)) .duration(19 * SECONDS + 4 * TICKS) .eut(4) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java index aa973cddfe..d7ef154a9f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java @@ -1,23 +1,23 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; -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.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.SubTag; 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.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -31,12 +31,12 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr ItemStack aStack) { switch (aPrefix) { case gearGt -> { - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); if (aMaterial.mStandardMoltenFluid != null) { if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Gear.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(576L)) .duration(6 * SECONDS + 8 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) @@ -46,21 +46,21 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { - case "Wood" -> GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, + case "Wood" -> GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GTProxy.tBits, new Object[] { "SPS", "PsP", "SPS", 'P', OrePrefixes.plank.get(aMaterial), 'S', OrePrefixes.stick.get(aMaterial) }); - case "Stone" -> GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, + case "Stone" -> GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GTProxy.tBits, new Object[] { "SPS", "PfP", "SPS", 'P', OrePrefixes.stoneSmooth, 'S', new ItemStack(Blocks.stone_button, 1, 32767) }); default -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GTProxy.tBits, new Object[] { "SPS", "PwP", "SPS", 'P', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.stick.get(aMaterial) }); } @@ -71,9 +71,9 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr case gearGtSmall -> { if (aMaterial.mStandardMoltenFluid != null) { if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Gear_Small.get(0L)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .fluidInputs(aMaterial.getMolten(144L)) .duration(16 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) @@ -83,19 +83,19 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { - case "Wood" -> GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, + case "Wood" -> GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GTProxy.tBits, new Object[] { "P ", " s", 'P', OrePrefixes.plank.get(aMaterial) }); - case "Stone" -> GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, + case "Stone" -> GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GTProxy.tBits, new Object[] { "P ", " f", 'P', OrePrefixes.stoneSmooth }); default -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GTProxy.tBits, new Object[] { " S ", "hPx", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial) }); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 76e60e18c5..2f92e58e56 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -6,28 +6,28 @@ import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.implosionRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -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.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; -import static gregtech.api.util.GT_Utility.calculateRecipeEU; +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.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTUtility.calculateRecipeEU; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -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.SubTag; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH GEM??? // generators @@ -54,21 +54,21 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra case gem -> { // fuel recipes if (aFuelPower) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, aMaterial.mFuelPower * 2) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } if (!OrePrefixes.block.isIgnored(aMaterial) - && GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) { + && GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) { // Compressor recipes // need to avoid iridium exploit if (aMaterial != Materials.Iridium) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) .duration(15 * SECONDS) .eut(2) .addTo(compressorRecipes); @@ -77,18 +77,18 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Smelting recipe if (!aNoSmelting) { - GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1, aStack), - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)); + GTModHandler.addSmeltingRecipe( + GTUtility.copyAmount(1, aStack), + GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)); } if (aNoSmashing) { // Forge hammer recipes { - if (GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(aStack) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(hammerRecipes); @@ -98,11 +98,11 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Forge hammer recipes { // need to avoid iridium exploit - if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null + if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null && aMaterial != Materials.Iridium) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(hammerRecipes); @@ -111,61 +111,61 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Bender recipes if (aMaterial != Materials.Iridium) { - if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { // Plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .duration((int) Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null) { // Double plates - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L) != null) { // Triple plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) { // Quadruple plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), GTUtility.getIntegratedCircuit(4)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 4L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L) != null) { // Quintuple plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(5, aStack), GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(5, aStack), GTUtility.getIntegratedCircuit(5)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 5L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) { // dense plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack), GTUtility.getIntegratedCircuit(9)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 9L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); @@ -175,13 +175,13 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aNoWorking) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { // Lathe recipes - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null - && GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null + && GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L)) .duration(((int) Math.max(aMaterialMass, 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(latheRecipes); @@ -191,40 +191,40 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { // Implosion compressor recipes { - if (GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16)) + if (GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(3, aStack), - GT_ModHandler.getIC2Item("dynamite", 4, null)) + GTUtility.copyAmount(3, aStack), + GTModHandler.getIC2Item("dynamite", 4, null)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(3, aStack), - GT_ModHandler.getIC2Item("industrialTnt", 2)) + GTUtility.copyAmount(3, aStack), + GTModHandler.getIC2Item("industrialTnt", 2)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); @@ -233,22 +233,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Crafting recipes { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), + GTProxy.tBits, new Object[] { "h", "X", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); if (aMaterial.contains(SubTag.SMELTING_TO_GEM)) { - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(1, aStack), + GTProxy.tBits, new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.nugget.get(aMaterial) }); } if (aSpecialRecipeReq) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GTProxy.tBits, new Object[] { "X", "m", 'X', OrePrefixes.gem.get(aMaterial) }); } } @@ -259,12 +259,12 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Laser engraver recipes { - if (GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L) != null) { is.stackSize = 0; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), is) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), is) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(laserEngraverRecipes); @@ -276,22 +276,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra case gemChipped -> { // Fuel recipes if (aFuelPower) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, aMaterial.mFuelPower / 2) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } if (!aNoWorking) { // Lathe recipes - if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null - && GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null + && GTOreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L)) .duration(((int) Math.max(aMaterialMass, 1L)) * TICKS) .eut(8) .addTo(latheRecipes); @@ -300,40 +300,40 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { // Implosion compressor recipes { - if (GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16)) + if (GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(3, aStack), - GT_ModHandler.getIC2Item("dynamite", 4, null)) + GTUtility.copyAmount(3, aStack), + GTModHandler.getIC2Item("dynamite", 4, null)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(3, aStack), - GT_ModHandler.getIC2Item("industrialTnt", 2)) + GTUtility.copyAmount(3, aStack), + GTModHandler.getIC2Item("industrialTnt", 2)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); @@ -342,14 +342,14 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Crafting recipes { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), + GTProxy.tBits, new Object[] { "h", "X", 'X', OrePrefixes.gemFlawed.get(aMaterial) }); if (aSpecialRecipeReq) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), + GTProxy.tBits, new Object[] { "X", "m", 'X', OrePrefixes.gemChipped.get(aMaterial) }); } } @@ -358,9 +358,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver is.stackSize = 0; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), is) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), is) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L)) .duration(30 * SECONDS) .eut(30) .addTo(laserEngraverRecipes); @@ -370,11 +370,11 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra case gemExquisite -> { // Fuel recipes if (aFuelPower) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, aMaterial.mFuelPower * 8) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } if (!aNoWorking) { @@ -382,9 +382,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Crafting recipes { if (aSpecialRecipeReq) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L), + GTProxy.tBits, new Object[] { "X", "m", 'X', OrePrefixes.gemExquisite.get(aMaterial) }); } } @@ -393,9 +393,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Forge hammer recipes { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(hammerRecipes); @@ -404,22 +404,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra case gemFlawed -> { // fuel recipes if (aFuelPower) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } if (!aNoWorking) { // Lathe recipes - if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null - && GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null + && GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 2L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L)) .duration(((int) Math.max(aMaterialMass, 1L)) * TICKS) .eut(12) .addTo(latheRecipes); @@ -428,40 +428,40 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { // Implosion compressor recipes { - if (GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16)) + if (GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(3, aStack), - GT_ModHandler.getIC2Item("dynamite", 4, null)) + GTUtility.copyAmount(3, aStack), + GTModHandler.getIC2Item("dynamite", 4, null)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(3, aStack), - GT_ModHandler.getIC2Item("industrialTnt", 2)) + GTUtility.copyAmount(3, aStack), + GTModHandler.getIC2Item("industrialTnt", 2)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); @@ -470,22 +470,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Crafting recipes { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), + GTProxy.tBits, new Object[] { "h", "X", 'X', OrePrefixes.gem.get(aMaterial) }); if (aSpecialRecipeReq) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), + GTProxy.tBits, new Object[] { "X", "m", 'X', OrePrefixes.gemFlawed.get(aMaterial) }); } } } } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(hammerRecipes); @@ -494,9 +494,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra is.stackSize = 0; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), is) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), is) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(laserEngraverRecipes); @@ -507,22 +507,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Fuel recipes if (aFuelPower) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, aMaterial.mFuelPower * 4) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } if (!aNoWorking) { // Lathe recipes - if (GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null - && GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + if (GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null + && GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), - GT_OreDictUnificator.getDust( + GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), + GTOreDictUnificator.getDust( aMaterial, aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount)) .duration(((int) Math.max(aMaterialMass * 5L, 1L)) * TICKS) @@ -533,40 +533,40 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { // Implosion compressor recipes { - if (GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16)) + if (GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(3, aStack), - GT_ModHandler.getIC2Item("dynamite", 4, null)) + GTUtility.copyAmount(3, aStack), + GTModHandler.getIC2Item("dynamite", 4, null)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(3, aStack), - GT_ModHandler.getIC2Item("industrialTnt", 2)) + GTUtility.copyAmount(3, aStack), + GTModHandler.getIC2Item("industrialTnt", 2)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) + GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); @@ -575,22 +575,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // Crafting recipes { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), + GTProxy.tBits, new Object[] { "h", "X", 'X', OrePrefixes.gemExquisite.get(aMaterial) }); if (aSpecialRecipeReq) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), + GTProxy.tBits, new Object[] { "X", "m", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); } } } } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(hammerRecipes); @@ -598,9 +598,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver is.stackSize = 0; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), is) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), is) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index 0be31a7e1d..7d27c2ee16 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -4,27 +4,27 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; 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.GT_Utility.calculateRecipeEU; +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 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.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_RecipeConstants; -import gregtech.api.util.GT_RecipeRegistrator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTRecipeRegistrator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -51,19 +51,19 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist case ingot -> { // Fuel recipe if (aMaterial.mFuelPower > 0) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } if (aMaterial.mStandardMoltenFluid != null && !(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { // Fluid solidifier recipes - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ingot.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(144L)) .duration(1 * SECONDS + 12 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) @@ -71,12 +71,12 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } // Reverse recipes { - GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator + GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); + GTRecipeRegistrator .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { - GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1, aStack), + GTRecipeRegistrator.registerReverseArcSmelting( + GTUtility.copyAmount(1, aStack), aMaterial, aPrefix.mMaterialAmount, null, @@ -84,26 +84,26 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist null); } } - ItemStack tStack = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L); + ItemStack tStack = GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L); if ((tStack != null) && ((aMaterial.mBlastFurnaceRequired) || aNoSmelting)) { - GT_ModHandler.removeFurnaceSmelting(tStack); + GTModHandler.removeFurnaceSmelting(tStack); } if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING) && !aMaterial.contains(SubTag.SMELTING_TO_GEM) && aMaterial.contains(SubTag.MORTAR_GRINDABLE)) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addShapelessCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GTProxy.tBits, new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.ingot.get(aMaterial) }); } if (!aNoSmashing) { // Forge hammer recipes if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV - && GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L)) + && GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L)) .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(hammerRecipes); @@ -113,64 +113,64 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Bender recipes { - if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) + if (GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) + if (GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) + if (GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), GTUtility.getIntegratedCircuit(4)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 4L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(5, aStack), GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) + if (GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(5, aStack), GTUtility.getIntegratedCircuit(5)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 5L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) + if (GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack), GTUtility.getIntegratedCircuit(9)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 9L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L)) + if (GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(10)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L)) .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(benderRecipes); @@ -182,16 +182,16 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing || aStretchy) { // bender recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); @@ -199,9 +199,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Enable crafting with hammer if tier is < IV. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), + GTProxy.tBits, new Object[] { "I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial) }); } } @@ -210,25 +210,25 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing || aStretchy) { // Bender recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), + GTProxy.tBits, new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotDouble.get(aMaterial), 'B', OrePrefixes.ingot.get(aMaterial) }); } @@ -238,9 +238,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing || aStretchy) { // Bender recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); @@ -248,9 +248,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // If tier < IV add manual crafting. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), + GTProxy.tBits, new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotTriple.get(aMaterial), 'B', OrePrefixes.ingot.get(aMaterial) }); } @@ -260,9 +260,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing || aStretchy) { // Bender recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); @@ -270,9 +270,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Crafting recipes if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), + GTProxy.tBits, new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotQuadruple.get(aMaterial), 'B', OrePrefixes.ingot.get(aMaterial) }); } @@ -280,11 +280,11 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } case ingotHot -> { if (aMaterial.mAutoGenerateVacuumFreezerRecipes - && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { + && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { // Vacuum freezer recipes - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) .duration(((int) Math.max(aMaterialMass * 3L, 1L)) * TICKS) .eut(TierEU.RECIPE_MV) .addTo(vacuumFreezerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java index 6a132e2dba..cd453943d2 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; public class ProcessingItem implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -16,29 +16,29 @@ public class ProcessingItem implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (GT_OreDictUnificator.getItemData(aStack) == null && !aOreDictName.equals("itemCertusQuartz") + if (GTOreDictUnificator.getItemData(aStack) == null && !aOreDictName.equals("itemCertusQuartz") && !aOreDictName.equals("itemNetherQuartz")) { switch (aOreDictName) { case "itemSilicon": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Silicon, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Silicon, 3628800L)); case "itemWheat": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Wheat, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Wheat, 3628800L)); case "itemManganese": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Manganese, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Manganese, 3628800L)); case "itemSalt": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Salt, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Salt, 3628800L)); case "itemMagnesium": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Magnesium, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Magnesium, 3628800L)); case "itemPhosphorite": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.TricalciumPhosphate, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.TricalciumPhosphate, 3628800L)); case "itemSulfur": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Sulfur, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Sulfur, 3628800L)); case "itemAluminum": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Aluminium, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Aluminium, 3628800L)); case "itemSaltpeter": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Saltpeter, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Saltpeter, 3628800L)); case "itemUranium": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Uranium, 3628800L)); + GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Uranium, 3628800L)); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index c3f73f7966..9576262818 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -2,20 +2,21 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; import net.minecraft.item.ItemStack; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; import gregtech.api.enums.TierEU; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeBuilder; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.common.covers.CoverLens; @SuppressWarnings("RedundantLabeledSwitchRuleCodeBlock") public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -29,56 +30,56 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr ItemStack aStack) { switch (aMaterial.mName) { case "Diamond", "Glass" -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_LV) .addTo(latheRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 3L), + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) .duration(2 * MINUTES) .eut(16) .addTo(latheRecipes); } case "ChromaticGlass" -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L)) .duration(10 * MINUTES) .eut(TierEU.RECIPE_UHV) .addTo(compressorRecipes); } default -> { - if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { - GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); - recipeBuilder.itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) == null) { - recipeBuilder.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L)); + if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); + recipeBuilder.itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)); + if (GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) == null) { + recipeBuilder.itemOutputs(GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L)); } else { recipeBuilder.itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L)); + GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L)); } recipeBuilder.duration(1 * MINUTES) .eut(TierEU.RECIPE_MV) .addTo(latheRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L) != null) { - GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); - recipeBuilder.itemInputs(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L)); - if (GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) == null) { - recipeBuilder.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L)); + if (GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L) != null) { + GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); + recipeBuilder.itemInputs(GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L)); + if (GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) == null) { + recipeBuilder.itemOutputs(GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L)); } else { recipeBuilder.itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L)); + GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L)); } recipeBuilder.duration(2 * MINUTES) .eut(TierEU.RECIPE_LV) @@ -86,10 +87,10 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr } final ITexture lensCoverTexture = TextureFactory .of(Textures.BlockIcons.OVERLAY_LENS, aMaterial.mRGBa, false); - GregTech_API.registerCover( + GregTechAPI.registerCover( aStack, TextureFactory.of(Textures.BlockIcons.MACHINE_CASINGS[2][0], lensCoverTexture), - new gregtech.common.covers.GT_Cover_Lens(aMaterial.mColor.mIndex, lensCoverTexture)); + new CoverLens(aMaterial.mColor.mIndex, lensCoverTexture)); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index 5985e24dc7..f60987ec9e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -9,21 +9,21 @@ import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gregtech.GT_Mod; -import gregtech.api.enums.GT_Values; +import gregtech.GTMod; +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; public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -35,86 +35,85 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (aOreDictName.equals("logRubber")) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(2)) .itemOutputs( ItemList.IC2_Resin.get(1L), - GT_ModHandler.getIC2Item("plantBall", 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) + GTModHandler.getIC2Item("plantBall", 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) .outputChances(5000, 3750, 2500, 2500) .fluidOutputs(Materials.Methane.getGas(60L)) .duration(10 * SECONDS) .eut(20) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L)) .duration(15 * SECONDS) .eut(2) .addTo(extractorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), ItemList.IC2_Resin.get(1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), ItemList.IC2_Resin.get(1L)) .outputChances(10000, 3300) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); } else { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(60L)) .duration(10 * SECONDS) .eut(20) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) .outputChances(10000, 8000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); } - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "sLf", 'L', GT_Utility.copyAmount(1, aStack) }); + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, + new Object[] { "sLf", 'L', GTUtility.copyAmount(1, aStack) }); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .duration(8 * SECONDS) .eut(7) .addTo(latheRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemList.FR_Stick.get(1L)) .fluidInputs(Materials.SeedOil.getFluid(50L)) .duration(16 * TICKS) .eut(7) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(8, aStack), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(8, aStack), GTUtility.getIntegratedCircuit(8)) .itemOutputs(ItemList.FR_Casing_Impregnated.get(1L)) .fluidInputs(Materials.SeedOil.getFluid(250L)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTModHandler.getModItem(Railcraft.ID, "cube", 1L, 8)) .fluidInputs(Materials.Creosote.getFluid(750L)) .duration(16 * TICKS) .eut(TierEU.ULV) @@ -123,172 +122,171 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra short aMeta = (short) aStack.getItemDamage(); if (aMeta == Short.MAX_VALUE) { - if ((GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1, aStack), false, null), + if ((GTUtility.areStacksEqual( + GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack)); + GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack)); } for (int i = 0; i < 32767; i++) { - if ((GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), + if ((GTUtility.areStacksEqual( + GTModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); + GTModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } - ItemStack tStack = GT_ModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i)); + ItemStack tStack = GTModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i)); if (tStack == null) { if (i >= 16) { break; } } else { - ItemStack tPlanks = GT_Utility.copyOrNull(tStack); + ItemStack tPlanks = GTUtility.copyOrNull(tStack); if (tPlanks != null) { tPlanks.stackSize = (tPlanks.stackSize * 3 / 2); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(aStack.getItem(), 1, i)) .itemOutputs( - GT_Utility.copyOrNull(tPlanks), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) + GTUtility.copyOrNull(tPlanks), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) .fluidInputs(Materials.Lubricant.getFluid(1L)) .duration(10 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(aStack.getItem(), 1, i)) .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .fluidInputs(Materials.Water.getFluid(Math.min(1000, 200 * 8 / 320))) .duration(20 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(aStack.getItem(), 1, i)) .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) - .fluidInputs(GT_ModHandler.getDistilledWater(3)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + .fluidInputs(GTModHandler.getDistilledWater(3)) .duration(20 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(aStack.getItem(), 1, i)) .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .fluidInputs(Materials.Lubricant.getFluid(1)) .duration(10 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_ModHandler.removeRecipeDelayed(new ItemStack(aStack.getItem(), 1, i)); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + GTModHandler.removeRecipeDelayed(new ItemStack(aStack.getItem(), 1, i)); + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, tStack), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.BUFFERED, new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility - .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addShapelessCraftingRecipe( + GTUtility + .copyAmount(tStack.stackSize / (GTMod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + GTModHandler.RecipeBits.BUFFERED, new Object[] { new ItemStack(aStack.getItem(), 1, i) }); } } } } else { - if ((GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1, aStack), false, null), + if ((GTUtility.areStacksEqual( + GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack)); + GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack)); } - ItemStack tStack = GT_ModHandler.getRecipeOutput(GT_Utility.copyAmount(1, aStack)); + ItemStack tStack = GTModHandler.getRecipeOutput(GTUtility.copyAmount(1, aStack)); if (tStack != null) { - ItemStack tPlanks = GT_Utility.copyOrNull(tStack); + ItemStack tPlanks = GTUtility.copyOrNull(tStack); if (tPlanks != null) { tPlanks.stackSize = (tPlanks.stackSize * 3 / 2); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_Utility.copyOrNull(tPlanks), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) + GTUtility.copyOrNull(tPlanks), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) .fluidInputs(Materials.Lubricant.getFluid(1L)) .duration(10 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .fluidInputs(Materials.Water.getFluid(Math.min(1000, 200 * 8 / 320))) .duration(20 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) - .fluidInputs(GT_ModHandler.getDistilledWater(3)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + .fluidInputs(GTModHandler.getDistilledWater(3)) .duration(20 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .fluidInputs(Materials.Lubricant.getFluid(1)) .duration(10 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1, aStack)); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + GTModHandler.removeRecipeDelayed(GTUtility.copyAmount(1, aStack)); + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, tStack), - new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1, aStack) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility - .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), - new Object[] { GT_Utility.copyAmount(1, aStack) }); + new Object[] { "s", "L", 'L', GTUtility.copyAmount(1, aStack) }); + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(tStack.stackSize / (GTMod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + new Object[] { GTUtility.copyAmount(1, aStack) }); } } } - if ((GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1, aStack), false, null), + if ((GTUtility.areStacksEqual( + GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack)); + GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack)); } } public static void addPyrolyeOvenRecipes(ItemStack logStack) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(1)) .itemOutputs(Materials.Charcoal.getGems(20)) .fluidOutputs(Materials.Creosote.getFluid(4000)) .duration(32 * SECONDS) .eut(64) .noOptimize() .addTo(pyrolyseRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(2)) .itemOutputs(Materials.Charcoal.getGems(20)) .fluidInputs(Materials.Nitrogen.getGas(1000)) .fluidOutputs(Materials.Creosote.getFluid(4000)) @@ -296,16 +294,16 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra .eut(96) .noOptimize() .addTo(pyrolyseRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(3)) .itemOutputs(Materials.Charcoal.getGems(20)) .fluidOutputs(Materials.CharcoalByproducts.getGas(4000)) .duration(32 * SECONDS) .eut(64) .noOptimize() .addTo(pyrolyseRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(4)) .itemOutputs(Materials.Charcoal.getGems(20)) .fluidInputs(Materials.Nitrogen.getGas(1000)) .fluidOutputs(Materials.CharcoalByproducts.getGas(4000)) @@ -313,16 +311,16 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra .eut(96) .noOptimize() .addTo(pyrolyseRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(5)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(5)) .itemOutputs(Materials.Charcoal.getGems(20)) .fluidOutputs(Materials.WoodGas.getGas(1500)) .duration(32 * SECONDS) .eut(64) .noOptimize() .addTo(pyrolyseRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(6)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(6)) .itemOutputs(Materials.Charcoal.getGems(20)) .fluidInputs(Materials.Nitrogen.getGas(1000)) .fluidOutputs(Materials.WoodGas.getGas(1500)) @@ -330,16 +328,16 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra .eut(96) .noOptimize() .addTo(pyrolyseRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(7)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(7)) .itemOutputs(Materials.Charcoal.getGems(20)) .fluidOutputs(Materials.WoodVinegar.getFluid(3000)) .duration(32 * SECONDS) .eut(64) .noOptimize() .addTo(pyrolyseRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(8)) .itemOutputs(Materials.Charcoal.getGems(20)) .fluidInputs(Materials.Nitrogen.getGas(1000)) .fluidOutputs(Materials.WoodVinegar.getFluid(3000)) @@ -347,16 +345,16 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra .eut(96) .noOptimize() .addTo(pyrolyseRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(9)) .itemOutputs(Materials.Charcoal.getGems(20)) .fluidOutputs(Materials.WoodTar.getFluid(1500)) .duration(32 * SECONDS) .eut(64) .noOptimize() .addTo(pyrolyseRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(10)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(10)) .itemOutputs(Materials.Charcoal.getGems(20)) .fluidInputs(Materials.Nitrogen.getGas(1000)) .fluidOutputs(Materials.WoodTar.getFluid(1500)) @@ -364,8 +362,8 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra .eut(96) .noOptimize() .addTo(pyrolyseRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(11)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(11)) .itemOutputs(Materials.Ash.getDust(4)) .fluidOutputs(Materials.OilHeavy.getFluid(200)) .duration(16 * SECONDS) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java index 8d7ca9e518..624730af3e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java @@ -2,23 +2,23 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; -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.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeCategories; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeRegistrator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeRegistrator; +import gregtech.api.util.GTUtility; public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -31,21 +31,21 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis ItemStack aStack) { if (aMaterial.contains(SubTag.SMELTING_TO_GEM) - && GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial.mSmeltInto, 1L)) + && GTOreDictUnificator.get(OrePrefixes.gem, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Mold_Ball.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial.mSmeltInto, 1L)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 2)) .addTo(alloySmelterRecipes); } if ((!aMaterial.contains(SubTag.SMELTING_TO_GEM)) - && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L) != null + && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L) != null && aMaterial != Materials.Aluminium) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Shape_Mold_Ingot.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Mold_Ingot.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 2)) .recipeCategory(RecipeCategories.alloySmelterMolding) @@ -54,9 +54,9 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis if (aMaterial.mStandardMoltenFluid != null) { if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Nugget.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(16L)) .duration(16 * TICKS) .eut(calculateRecipeEU(aMaterial, 4)) @@ -64,24 +64,24 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis } } - GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator + GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); + GTRecipeRegistrator .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); if (!aMaterial.contains(SubTag.NO_SMELTING) - && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), ItemList.Shape_Mold_Nugget.get(0L)) - .itemOutputs(GT_Utility.copyAmount(9, aStack)) + .itemOutputs(GTUtility.copyAmount(9, aStack)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 1)) .recipeCategory(RecipeCategories.alloySmelterMolding) .addTo(alloySmelterRecipes); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 8L), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.nugget, aMaterial, 8L), + GTModHandler.RecipeBits.BUFFERED, new Object[] { "sI ", 'I', OrePrefixes.ingot.get(aMaterial) }); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 79342a460d..4d0b405fea 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -4,22 +4,22 @@ import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import java.util.ArrayList; import net.minecraft.item.ItemStack; -import gregtech.GT_Mod; -import gregtech.api.enums.GT_Values; +import gregtech.GTMod; +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.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 ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -41,21 +41,21 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra // For Sake of god of balance! // Dense ore - if (GT_Mod.gregtechproxy.mRichOreYieldMultiplier) { + if (GTMod.gregtechproxy.mRichOreYieldMultiplier) { tIsRich = (aPrefix == OrePrefixes.oreRich) || (aPrefix == OrePrefixes.oreDense); } // NetherOre - if (GT_Mod.gregtechproxy.mNetherOreYieldMultiplier && !tIsRich) { + if (GTMod.gregtechproxy.mNetherOreYieldMultiplier && !tIsRich) { tIsRich = (aPrefix == OrePrefixes.oreNetherrack) || (aPrefix == OrePrefixes.oreNether); } // EndOre - if (GT_Mod.gregtechproxy.mEndOreYieldMultiplier && !tIsRich) { + if (GTMod.gregtechproxy.mEndOreYieldMultiplier && !tIsRich) { tIsRich = (aPrefix == OrePrefixes.oreEndstone) || (aPrefix == OrePrefixes.oreEnd); } if (aMaterial == Materials.Oilsands) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs(new ItemStack(net.minecraft.init.Blocks.sand, 1, 0)) .outputChances(tIsRich ? 2000 : 4000) .fluidOutputs(Materials.OilHeavy.getFluid(tIsRich ? 4000L : 2000L)) @@ -63,67 +63,67 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra .eut(TierEU.RECIPE_LV) .addTo(centrifugeRecipes); } else { - registerStandardOreRecipes(aPrefix, aMaterial, GT_Utility.copyAmount(1, aStack), tIsRich ? 2 : 1); + registerStandardOreRecipes(aPrefix, aMaterial, GTUtility.copyAmount(1, aStack), tIsRich ? 2 : 1); } } private boolean registerStandardOreRecipes(OrePrefixes aPrefix, Materials aMaterial, ItemStack aOreStack, int aMultiplier) { if ((aOreStack == null) || (aMaterial == null)) return false; - GT_ModHandler - .addValuableOre(GT_Utility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue); + GTModHandler + .addValuableOre(GTUtility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue); Materials tMaterial = aMaterial.mOreReplacement; Materials tPrimaryByMaterial = null; aMultiplier = Math.max(1, aMultiplier); - aOreStack = GT_Utility.copyAmount(1, aOreStack); + aOreStack = GTUtility.copyAmount(1, aOreStack); aOreStack.stackSize = 1; - ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); - ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); + ItemStack tIngot = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); + ItemStack tGem = GTOreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); ItemStack tSmeltInto = tIngot == null ? null : aMaterial.contains(SubTag.SMELTING_TO_GEM) - ? GT_OreDictUnificator.get( + ? GTOreDictUnificator.get( OrePrefixes.gem, tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.crystal, tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.gem, tMaterial, - GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), 1L), 1L), 1L) : tIngot; - ItemStack tDust = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); - ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); - ItemStack tCrushed = GT_OreDictUnificator + ItemStack tDust = GTOreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); + ItemStack tCleaned = GTOreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); + ItemStack tCrushed = GTOreDictUnificator .get(OrePrefixes.crushed, tMaterial, (long) aMaterial.mOreMultiplier * aMultiplier); ItemStack tPrimaryByProduct = null; if (tCrushed == null) { - tCrushed = GT_OreDictUnificator.get( + tCrushed = GTOreDictUnificator.get( OrePrefixes.dustImpure, tMaterial, - GT_Utility.copyAmount(aMaterial.mOreMultiplier * aMultiplier, tCleaned, tDust, tGem), + GTUtility.copyAmount(aMaterial.mOreMultiplier * aMultiplier, tCleaned, tDust, tGem), (long) aMaterial.mOreMultiplier * aMultiplier); } for (Materials tMat : aMaterial.mOreByProducts) { - GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); + GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L); if (tPrimaryByProduct == null) { tPrimaryByMaterial = tMat; - tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator - .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + tPrimaryByProduct = GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L); + if (GTOreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GTOreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GTOreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } - GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator - .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L); + if (GTOreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GTOreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GTOreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } if (tPrimaryByMaterial == null) tPrimaryByMaterial = tMaterial; @@ -132,33 +132,33 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra if (tSmeltInto != null) { if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { - GT_ModHandler.removeFurnaceSmelting(aOreStack); + GTModHandler.removeFurnaceSmelting(aOreStack); } else { - tHasSmelting = GT_ModHandler.addSmeltingRecipe( + tHasSmelting = GTModHandler.addSmeltingRecipe( aOreStack, - GT_Utility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto)); + GTUtility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto)); } if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_TRIPLE)) { if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) .itemOutputs( - GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) .itemOutputs( - GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) @@ -166,24 +166,24 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra } } else if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_DOUBLE)) { if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) .itemOutputs( - GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) .itemOutputs( - GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) @@ -193,18 +193,18 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra } if (!tHasSmelting) { - GT_ModHandler.addSmeltingRecipe( + GTModHandler.addSmeltingRecipe( aOreStack, - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.gem, tMaterial.mDirectSmelting, Math.max(1, aMultiplier * aMaterial.mSmeltingMultiplier / 2))); } if (tCrushed != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aOreStack) - .itemOutputs(GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed)) + .itemOutputs(GTUtility.copy(GTUtility.copyAmount(tCrushed.stackSize, tGem), tCrushed)) .duration(10) .eut(16) .addTo(hammerRecipes); @@ -212,19 +212,19 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra int chanceOre2 = tPrimaryByProduct == null ? 0 : tPrimaryByProduct.stackSize * 10 * aMultiplier * aMaterial.mByProductMultiplier; chanceOre2 = 100 * chanceOre2; // converting to the GT format, 100% is 10000 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aOreStack) .itemOutputs( - GT_Utility.mul(2, tCrushed), - tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GT_OreDictUnificator.get( + GTUtility.mul(2, tCrushed), + tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GTOreDictUnificator.get( OrePrefixes.crystal, Materials.Cinnabar, - GT_OreDictUnificator - .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1, tPrimaryByProduct), 1L), + GTOreDictUnificator + .get(OrePrefixes.gem, tPrimaryByMaterial, GTUtility.copyAmount(1, tPrimaryByProduct), 1L), 1L) - : GT_OreDictUnificator - .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1, tPrimaryByProduct), 1L), - GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial)) + : GTOreDictUnificator + .get(OrePrefixes.gem, tPrimaryByMaterial, GTUtility.copyAmount(1, tPrimaryByProduct), 1L), + GTOreDictUnificator.getDust(aPrefix.mSecondaryMaterial)) .outputChances(10000, chanceOre2, 5000) .duration(20 * SECONDS) .eut(2) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java index ac9106d31b..d71b4a61f4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java @@ -2,17 +2,17 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; 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.enums.SubTag; -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 ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -43,30 +43,30 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi break; } if (aMaterial != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, aMultiplier)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, aMultiplier)) .duration(10) .eut(16) .addTo(hammerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 2 * aMultiplier), - GT_OreDictUnificator.get( + GTOreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 2 * aMultiplier), + GTOreDictUnificator.get( OrePrefixes.dustTiny, - GT_Utility.selectItemInList(0, aMaterial, aMaterial.mOreByProducts), + GTUtility.selectItemInList(0, aMaterial, aMaterial.mOreByProducts), 1L), - GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial)) + GTOreDictUnificator.getDust(aPrefix.mSecondaryMaterial)) .outputChances(10000, 100 * 5 * aMultiplier, 10000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - if (aMaterial.contains(SubTag.NO_SMELTING)) GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1, aStack), - GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier)); + if (aMaterial.contains(SubTag.NO_SMELTING)) GTModHandler.addSmeltingRecipe( + GTUtility.copyAmount(1, aStack), + GTOreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier)); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java index 93458ee467..315bdcd6dd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -2,24 +2,24 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.primitiveBlastRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import gregtech.GT_Mod; -import gregtech.api.enums.GT_Values; +import gregtech.GTMod; +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.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeBuilder; -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.GTUtility; public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -34,24 +34,24 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_ModHandler.removeFurnaceSmelting(aStack); + GTModHandler.removeFurnaceSmelting(aStack); if (!aMaterial.contains(SubTag.NO_SMELTING)) { if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { if (aMaterial.mBlastFurnaceTemp < 1000 && aMaterial.mDirectSmelting.mBlastFurnaceTemp < 1000) if (aMaterial.mAutoGenerateBlastFurnaceRecipes - && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { - GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); + && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { + GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); recipeBuilder - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)); + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)); if (aMaterial.mBlastFurnaceTemp > 1750) { recipeBuilder.itemOutputs( - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.ingotHot, aMaterial, - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), 1L)); } else { - recipeBuilder.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)); + recipeBuilder.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)); } recipeBuilder .duration(Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp * TICKS) @@ -70,7 +70,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe outputSize = 10; outputPrefix = OrePrefixes.nugget; } else { - if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { + if (GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { outputSize = 6; outputPrefix = OrePrefixes.nugget; } else { @@ -80,18 +80,18 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe } break; case dust: - int outputAmount = GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre ? 2 : 3; + int outputAmount = GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre ? 2 : 3; if (aMaterial.mDirectSmelting != aMaterial) { if (!aMaterial.contains(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE) && aMaterial.mDirectSmelting.getIngots(1) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack)) .itemOutputs(aMaterial.mDirectSmelting.getIngots(outputAmount)) .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); } else if (aMaterial == Materials.Chalcopyrite) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), new ItemStack(Blocks.sand, 2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -99,7 +99,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.Glass.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -107,7 +107,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.SiliconDioxide.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -115,7 +115,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.Quartzite.getDust(4)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -123,7 +123,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.NetherQuartz.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -131,7 +131,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.CertusQuartz.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -140,7 +140,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); } else if (aMaterial == Materials.Tetrahedrite) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -149,7 +149,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); } else if (aMaterial == Materials.Galena) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -166,7 +166,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe outputPrefix = OrePrefixes.ingot; outputSize = 1; } else { - if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { + if (GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { outputSize = 6; outputPrefix = OrePrefixes.nugget; } else { @@ -180,14 +180,14 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe outputSize = 1; break; } - ItemStack tStack = GT_OreDictUnificator.get(outputPrefix, aMaterial.mDirectSmelting, outputSize); - if (tStack == null) tStack = GT_OreDictUnificator.get( + ItemStack tStack = GTOreDictUnificator.get(outputPrefix, aMaterial.mDirectSmelting, outputSize); + if (tStack == null) tStack = GTOreDictUnificator.get( aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); if ((tStack == null) && (!aMaterial.contains(SubTag.SMELTING_TO_GEM))) - tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); - GT_ModHandler.addSmeltingRecipe(aStack, tStack); + tStack = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); + GTModHandler.addSmeltingRecipe(aStack, tStack); } } } 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); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java index 3b06babee6..e6a74aac19 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java @@ -3,19 +3,19 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; 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.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 ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -27,38 +27,38 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (aOreDictName.startsWith("plankWood")) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2L)) .duration(10 * TICKS) .eut(8) .addTo(latheRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(1, aStack), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 1L)) + GTUtility.copyAmount(1, aStack), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 1L)) .itemOutputs(ItemList.Crate_Empty.get(1L)) .duration(10 * SECONDS) .eut(1) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(1, aStack), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.WroughtIron, 1L)) + GTUtility.copyAmount(1, aStack), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.WroughtIron, 1L)) .itemOutputs(ItemList.Crate_Empty.get(1L)) .duration(10 * SECONDS) .eut(1) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(1, aStack), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)) + GTUtility.copyAmount(1, aStack), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)) .itemOutputs(ItemList.Crate_Empty.get(1L)) .duration(10 * SECONDS) .eut(1) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(8, aStack), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(8, aStack), GTUtility.getIntegratedCircuit(8)) .itemOutputs(new ItemStack(Blocks.chest, 1)) .duration(40 * SECONDS) .eut(4) @@ -66,69 +66,69 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist if (aStack.getItemDamage() == 32767) { for (byte i = 0; i < 64; i = (byte) (i + 1)) { - ItemStack tStack = GT_Utility.copyMetaData(i, aStack); + ItemStack tStack = GTUtility.copyMetaData(i, aStack); // Get Recipe and Output, add recipe to delayed removal - ItemStack tOutput = GT_ModHandler.getRecipeOutput(tStack, tStack, tStack); + ItemStack tOutput = GTModHandler.getRecipeOutput(tStack, tStack, tStack); if ((tOutput != null) && (tOutput.stackSize >= 3)) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, tStack)) - .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, tStack)) + .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput)) .fluidInputs(Materials.Water.getFluid(4)) .duration(2 * 25 * TICKS) .eut(4) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, tStack)) - .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) - .fluidInputs(GT_ModHandler.getDistilledWater(3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, tStack)) + .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput)) + .fluidInputs(GTModHandler.getDistilledWater(3)) .duration(2 * 25 * TICKS) .eut(4) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, tStack)) - .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, tStack)) + .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput)) .fluidInputs(Materials.Lubricant.getFluid(1)) .duration(25 * TICKS) .eut(4) .addTo(cutterRecipes); - GT_ModHandler.removeRecipeDelayed(tStack, tStack, tStack); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.removeRecipeDelayed(tStack, tStack, tStack); + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(tOutput.stackSize / 3, tOutput), + GTModHandler.RecipeBits.BUFFERED, new Object[] { "sP", 'P', tStack }); } if ((tStack == null) && (i >= 16)) break; } } else { ItemStack tOutput = !aModName.equalsIgnoreCase("thaumcraft") - ? GT_ModHandler.getRecipeOutput(aStack, aStack, aStack) - : GT_ModHandler.getRecipeOutputNoOreDict(aStack, aStack, aStack); + ? GTModHandler.getRecipeOutput(aStack, aStack, aStack) + : GTModHandler.getRecipeOutputNoOreDict(aStack, aStack, aStack); if ((tOutput != null) && (tOutput.stackSize >= 3)) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput)) .fluidInputs(Materials.Water.getFluid(4)) .duration(2 * 25) .eut(4) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) - .fluidInputs(GT_ModHandler.getDistilledWater(3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput)) + .fluidInputs(GTModHandler.getDistilledWater(3)) .duration(2 * 25) .eut(4) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput)) .fluidInputs(Materials.Lubricant.getFluid(1)) .duration(25) .eut(4) .addTo(cutterRecipes); - GT_ModHandler.removeRecipeDelayed(aStack, aStack, aStack); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.removeRecipeDelayed(aStack, aStack, aStack); + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(tOutput.stackSize / 3, tOutput), + GTModHandler.RecipeBits.BUFFERED, new Object[] { "sP", 'P', aStack }); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 801eaa8354..574af24531 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -1,9 +1,9 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.enums.GT_Values.L; -import static gregtech.api.enums.GT_Values.NI; -import static gregtech.api.enums.GT_Values.RA; -import static gregtech.api.enums.GT_Values.W; +import static gregtech.api.enums.GTValues.L; +import static gregtech.api.enums.GTValues.NI; +import static gregtech.api.enums.GTValues.RA; +import static gregtech.api.enums.GTValues.W; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.benderRecipes; @@ -11,24 +11,24 @@ import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.implosionRecipes; -import static gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED; -import static gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS; -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_RecipeBuilder.WILDCARD; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; -import static gregtech.api.util.GT_Utility.calculateRecipeEU; -import static gregtech.common.GT_Proxy.tBits; +import static gregtech.api.util.GTModHandler.RecipeBits.BUFFERED; +import static gregtech.api.util.GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS; +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.GTRecipeBuilder.WILDCARD; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTUtility.calculateRecipeEU; +import static gregtech.common.GTProxy.tBits; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -38,11 +38,11 @@ import gregtech.api.enums.TierEU; import gregtech.api.enums.ToolDictNames; import gregtech.api.recipe.RecipeCategories; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_RecipeRegistrator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTRecipeRegistrator; +import gregtech.api.util.GTUtility; public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -92,25 +92,25 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist registerCover(aMaterial, aStack); - GT_ModHandler.removeRecipeByOutputDelayed(aStack); - GT_ModHandler.removeRecipeDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeDelayed(aStack); - GT_Utility.removeSimpleIC2MachineRecipe( - GT_Utility.copyAmount(9, aStack), - GT_ModHandler.getCompressorRecipeList(), - GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)); + GTUtility.removeSimpleIC2MachineRecipe( + GTUtility.copyAmount(9, aStack), + GTModHandler.getCompressorRecipeList(), + GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)); if (aMaterial.mFuelPower > 0) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } if (aMaterial.mStandardMoltenFluid != null && !(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) .itemOutputs(aMaterial.getPlates(1)) .fluidInputs(aMaterial.getMolten(L)) @@ -119,14 +119,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .addTo(fluidSolidifierRecipes); } - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L), + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE new Object[] { "hX", 'X', OrePrefixes.plate.get(aMaterial) }); if (aMaterial == Materials.Paper) { - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(2, aStack), + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(2, aStack), BUFFERED, new Object[] { "XXX", 'X', new ItemStack(Items.reeds, 1, W) }); } @@ -136,27 +136,27 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE new Object[] { "h", // craftingToolHardHammer "X", "X", 'X', OrePrefixes.ingot.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE new Object[] { "H", // craftingToolForgeHammer "X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE new Object[] { "h", // craftingToolHardHammer "X", 'X', OrePrefixes.gem.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE new Object[] { "H", // craftingToolForgeHammer @@ -167,7 +167,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.contains(SubTag.MORTAR_GRINDABLE)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addShapelessCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( aMaterial.getDust(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.plate.get(aMaterial) }); @@ -181,33 +181,33 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist registerCover(aMaterial, aStack); - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); if (!aNoSmashing || aMaterial.contains(SubTag.STRETCHY)) { // 2 double -> 1 quadruple plate - if (GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) + if (GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } // 2 plates -> 1 double plate - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } else { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .fluidInputs(Materials.Glue.getFluid(10L)) .duration(3 * SECONDS + 4 * TICKS) .eut(8) @@ -217,8 +217,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { Object aPlateStack = OrePrefixes.plate.get(aMaterial); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(1, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { "I", "B", "h", // craftingToolHardHammer 'I', aPlateStack, 'B', aPlateStack }); @@ -231,33 +231,33 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist registerCover(aMaterial, aStack); - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); if (!aNoSmashing || aMaterial.contains(SubTag.STRETCHY)) { - if (GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) { // 3 triple plates -> 1 dense plate - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), + GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } else { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), + GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .fluidInputs(Materials.Glue.getFluid(20L)) .duration(4 * SECONDS + 16 * TICKS) .eut(8) @@ -267,50 +267,50 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { Object aPlateStack = OrePrefixes.plate.get(aMaterial); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(1, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { "I", "B", "h", // craftingToolHardHammer 'I', OrePrefixes.plateDouble.get(aMaterial), 'B', aPlateStack }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, aPlateStack }); } } - if (GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Block_Powderbarrel.get(4)) + if (GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Block_Powderbarrel.get(4)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) + GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_ModHandler.getIC2Item("dynamite", 1, null)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTModHandler.getIC2Item("dynamite", 1, null)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) + GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), new ItemStack(Blocks.tnt, 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), new ItemStack(Blocks.tnt, 2)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) + GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_ModHandler.getIC2Item("industrialTnt", 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTModHandler.getIC2Item("industrialTnt", 1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) + GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); @@ -322,24 +322,24 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist registerCover(aMaterial, aStack); - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); if (!aNoSmashing || aMaterial.contains(SubTag.STRETCHY)) { // Quadruple plate - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), + GTUtility.getIntegratedCircuit(4)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .duration(Math.max(aMaterialMass * 4L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } else { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), + GTUtility.getIntegratedCircuit(4)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .fluidInputs(Materials.Glue.getFluid(30L)) .duration(6 * SECONDS + 8 * TICKS) .eut(8) @@ -348,14 +348,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { Object aPlateStack = OrePrefixes.plate.get(aMaterial); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(1, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { "I", "B", "h", // craftingToolHardHammer 'I', OrePrefixes.plateTriple.get(aMaterial), 'B', aPlateStack }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, aPlateStack, aPlateStack }); @@ -368,24 +368,24 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist registerCover(aMaterial, aStack); - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); if (!aNoSmashing || aMaterial.contains(SubTag.STRETCHY)) { // quintuple plate - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), + GTUtility.getIntegratedCircuit(5)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .duration(Math.max(aMaterialMass * 5L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); } else { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), + GTUtility.getIntegratedCircuit(5)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .fluidInputs(Materials.Glue.getFluid(40L)) .duration(8 * SECONDS) .eut(8) @@ -394,14 +394,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { Object aPlateStack = OrePrefixes.plate.get(aMaterial); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount(1, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { "I", "B", "h", // craftingToolHardHammer 'I', OrePrefixes.plateQuadruple.get(aMaterial), 'B', aPlateStack }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, aPlateStack, aPlateStack, aPlateStack }); @@ -414,15 +414,15 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist registerCover(aMaterial, aStack); - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); if (!aNoSmashing || aMaterial.contains(SubTag.STRETCHY)) { // Dense plate - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), + GTUtility.getIntegratedCircuit(9)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .duration(Math.max(aMaterialMass * 9L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(benderRecipes); @@ -432,12 +432,12 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist private void registerItemCasing(final OrePrefixes aPrefix, final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing) { - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); if (aMaterial.mStandardMoltenFluid != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(L / 2)) .duration(16 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) @@ -447,45 +447,45 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial && !aNoSmashing) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE new Object[] { "h X", 'X', OrePrefixes.plate.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE new Object[] { "H X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', OrePrefixes.plate.get(aMaterial) }); } } - if (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 2L), + GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 2L), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GT_Utility.copyAmount(3, aStack)) + .itemOutputs(GTUtility.copyAmount(3, aStack)) .duration(6 * SECONDS + 8 * TICKS) .eut(calculateRecipeEU(aMaterial, 15)) .recipeCategory(RecipeCategories.alloySmelterMolding) .addTo(alloySmelterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L)) .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 45)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L)) + if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L)) .fluidInputs( Materials.Water.getFluid( Math.max( @@ -497,11 +497,11 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .eut(calculateRecipeEU(aMaterial, 16)) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L)) .fluidInputs( - GT_ModHandler.getDistilledWater( + GTModHandler.getDistilledWater( Math.max( 3, Math.min( @@ -511,9 +511,9 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .eut(calculateRecipeEU(aMaterial, 16)) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L)) .fluidInputs( Materials.Lubricant.getFluid( Math.max( @@ -526,43 +526,43 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .eut(calculateRecipeEU(aMaterial, 16)) .addTo(cutterRecipes); } - GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); + GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); } private void registerPlateAlloy(final String aOreDictName, final ItemStack aStack) { switch (aOreDictName) { case "plateAlloyCarbon" -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("generator", 1L), GT_Utility.copyAmount(4, aStack)) - .itemOutputs(GT_ModHandler.getIC2Item("windMill", 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getIC2Item("generator", 1L), GTUtility.copyAmount(4, aStack)) + .itemOutputs(GTModHandler.getIC2Item("windMill", 1L)) .duration(5 * MINUTES + 20 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), new ItemStack(Blocks.glass, 3, W)) - .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), new ItemStack(Blocks.glass, 3, W)) + .itemOutputs(GTModHandler.getIC2Item("reinforcedGlass", 4L)) .duration(20 * SECONDS) .eut(4) .addTo(alloySmelterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), Materials.Glass.getDust(3)) - .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), Materials.Glass.getDust(3)) + .itemOutputs(GTModHandler.getIC2Item("reinforcedGlass", 4L)) .duration(20 * SECONDS) .eut(4) .addTo(alloySmelterRecipes); } case "plateAlloyAdvanced" -> { RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), new ItemStack(Blocks.glass, 3, WILDCARD)) - .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L)) + .itemInputs(GTUtility.copyAmount(1, aStack), new ItemStack(Blocks.glass, 3, WILDCARD)) + .itemOutputs(GTModHandler.getIC2Item("reinforcedGlass", 4L)) .duration(20 * SECONDS) .eut(4) .addTo(alloySmelterRecipes); RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), Materials.Glass.getDust(3)) - .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L)) + .itemInputs(GTUtility.copyAmount(1, aStack), Materials.Glass.getDust(3)) + .itemOutputs(GTModHandler.getIC2Item("reinforcedGlass", 4L)) .duration(20 * SECONDS) .eut(4) .addTo(alloySmelterRecipes); @@ -570,7 +570,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist case "plateAlloyIridium" -> // Remove IC2 Shaped recipe for Iridium Reinforced Plate - GT_ModHandler.removeRecipeByOutputDelayed(aStack); + GTModHandler.removeRecipeByOutputDelayed(aStack); default -> {} } } @@ -582,11 +582,11 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist // Try different prefixes to use same smooth stones as older GT5U for (OrePrefixes orePrefix : new OrePrefixes[] { OrePrefixes.block, OrePrefixes.block_, OrePrefixes.stoneSmooth, OrePrefixes.stone }) { - if ((tStack = GT_OreDictUnificator.get(orePrefix, aMaterial, 1)) != NI) break; + if ((tStack = GTOreDictUnificator.get(orePrefix, aMaterial, 1)) != NI) break; } // Register the cover - GregTech_API.registerCover( + GregTechAPI.registerCover( aStack, // If there is an ItemStack of Block for Materials tStack == NI ? diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java index 01262d32f4..40adf386f8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java @@ -2,15 +2,15 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; 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 ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -23,24 +23,24 @@ public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L)) .duration(10) .eut(16) .addTo(hammerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.dustPure, aMaterial.mMacerateInto, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), 1L), - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.dust, - GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + GTUtility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)) .outputChances(10000, 1000) .duration(20 * SECONDS) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java index 2da9f4b865..902c46bd0b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java @@ -4,20 +4,20 @@ import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; 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; public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -31,8 +31,8 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (aMaterial == Materials.Oilsands) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs(new ItemStack(net.minecraft.init.Blocks.sand, 1, 0)) .outputChances(4000) .fluidOutputs(Materials.OilHeavy.getFluid(2000L)) @@ -40,64 +40,64 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis .eut(TierEU.RECIPE_LV) .addTo(centrifugeRecipes); } else { - registerStandardOreRecipes(aPrefix, aMaterial, GT_Utility.copyAmount(1, aStack), 1); + registerStandardOreRecipes(aPrefix, aMaterial, GTUtility.copyAmount(1, aStack), 1); } } private boolean registerStandardOreRecipes(OrePrefixes aPrefix, Materials aMaterial, ItemStack aOreStack, int aMultiplier) { if ((aOreStack == null) || (aMaterial == null)) return false; - GT_ModHandler - .addValuableOre(GT_Utility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue); + GTModHandler + .addValuableOre(GTUtility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue); Materials tMaterial = aMaterial.mOreReplacement; Materials tPrimaryByMaterial = null; aMultiplier = Math.max(1, aMultiplier); - aOreStack = GT_Utility.copyAmount(1, aOreStack); + aOreStack = GTUtility.copyAmount(1, aOreStack); aOreStack.stackSize = 1; - ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); - ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); + ItemStack tIngot = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); + ItemStack tGem = GTOreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); ItemStack tSmeltInto = tIngot == null ? null : aMaterial.contains(SubTag.SMELTING_TO_GEM) - ? GT_OreDictUnificator.get( + ? GTOreDictUnificator.get( OrePrefixes.gem, tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.crystal, tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.gem, tMaterial, - GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), 1L), 1L), 1L) : tIngot; - ItemStack tDust = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); - ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); - ItemStack tCrushed = GT_OreDictUnificator.get(OrePrefixes.crushed, tMaterial, (long) aMaterial.mOreMultiplier); + ItemStack tDust = GTOreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); + ItemStack tCleaned = GTOreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); + ItemStack tCrushed = GTOreDictUnificator.get(OrePrefixes.crushed, tMaterial, (long) aMaterial.mOreMultiplier); ItemStack tPrimaryByProduct = null; if (tCrushed == null) { - tCrushed = GT_OreDictUnificator.get( + tCrushed = GTOreDictUnificator.get( OrePrefixes.dustImpure, tMaterial, - GT_Utility.copyAmount(aMaterial.mOreMultiplier, tCleaned, tDust, tGem), + GTUtility.copyAmount(aMaterial.mOreMultiplier, tCleaned, tDust, tGem), (long) aMaterial.mOreMultiplier); } for (Materials tMat : aMaterial.mOreByProducts) { - GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); + GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L); if (tPrimaryByProduct == null) { tPrimaryByMaterial = tMat; - tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator - .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + tPrimaryByProduct = GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L); + if (GTOreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GTOreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GTOreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } - GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator - .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L); + if (GTOreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GTOreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GTOreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } if (tPrimaryByMaterial == null) tPrimaryByMaterial = tMaterial; @@ -106,32 +106,32 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis if (tSmeltInto != null) { if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { - GT_ModHandler.removeFurnaceSmelting(aOreStack); + GTModHandler.removeFurnaceSmelting(aOreStack); } else { - tHasSmelting = GT_ModHandler - .addSmeltingRecipe(aOreStack, GT_Utility.copyAmount(aMaterial.mSmeltingMultiplier, tSmeltInto)); + tHasSmelting = GTModHandler + .addSmeltingRecipe(aOreStack, GTUtility.copyAmount(aMaterial.mSmeltingMultiplier, tSmeltInto)); } if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_TRIPLE)) { if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) .itemOutputs( - GT_Utility.mul(3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(3 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) .itemOutputs( - GT_Utility.mul(3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(3 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) @@ -139,24 +139,24 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis } } else if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_DOUBLE)) { if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) .itemOutputs( - GT_Utility.mul(2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(2 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) .itemOutputs( - GT_Utility.mul(2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(2 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) @@ -166,20 +166,20 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis } if (!tHasSmelting) { - GT_ModHandler.addSmeltingRecipe( + GTModHandler.addSmeltingRecipe( aOreStack, - GT_OreDictUnificator + GTOreDictUnificator .get(OrePrefixes.gem, tMaterial.mDirectSmelting, Math.max(1, aMaterial.mSmeltingMultiplier / 2))); } if (tCrushed != null) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.mul(1, tCrushed), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.mul(1, tCrushed), new Object[] { aOreStack, ToolDictNames.craftingToolHardHammer }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aOreStack) - .itemOutputs(GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed)) + .itemOutputs(GTUtility.copy(GTUtility.copyAmount(tCrushed.stackSize, tGem), tCrushed)) .duration(10) .eut(16) .addTo(hammerRecipes); @@ -187,19 +187,19 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis int chanceOre2 = tPrimaryByProduct == null ? 0 : tPrimaryByProduct.stackSize * 5 * aMaterial.mByProductMultiplier; chanceOre2 = 100 * chanceOre2; // converting to the GT format, 100% is 10000 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aOreStack) .itemOutputs( - GT_Utility.mul(2, tCrushed), - tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GT_OreDictUnificator.get( + GTUtility.mul(2, tCrushed), + tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GTOreDictUnificator.get( OrePrefixes.crystal, Materials.Cinnabar, - GT_OreDictUnificator - .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1, tPrimaryByProduct), 1L), + GTOreDictUnificator + .get(OrePrefixes.gem, tPrimaryByMaterial, GTUtility.copyAmount(1, tPrimaryByProduct), 1L), 1L) - : GT_OreDictUnificator - .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1, tPrimaryByProduct), 1L), - GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial)) + : GTOreDictUnificator + .get(OrePrefixes.gem, tPrimaryByMaterial, GTUtility.copyAmount(1, tPrimaryByProduct), 1L), + GTOreDictUnificator.getDust(aPrefix.mSecondaryMaterial)) .outputChances(10000, chanceOre2, 5000) .duration(20 * SECONDS) .eut(2) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java index bfa580b4c4..92daf2926b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java @@ -1,17 +1,17 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.cannerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; 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.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeBuilder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.api.util.GTUtility; public class ProcessingRecycling implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -24,18 +24,18 @@ public class ProcessingRecycling implements gregtech.api.interfaces.IOreRecipeRe @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if ((aMaterial != Materials.Empty) && (GT_Utility.getFluidForFilledItem(aStack, true) == null) + if ((aMaterial != Materials.Empty) && (GTUtility.getFluidForFilledItem(aStack, true) == null) && !aMaterial.contains(SubTag.SMELTING_TO_FLUID) - && (GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null)) { - GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); + && (GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null)) { + GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); recipeBuilder.itemInputs(aStack); - if (GT_Utility.getContainerItem(aStack, true) == null) { + if (GTUtility.getContainerItem(aStack, true) == null) { recipeBuilder.itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L)); + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L)); } else { recipeBuilder.itemOutputs( - GT_Utility.getContainerItem(aStack, true), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L)); + GTUtility.getContainerItem(aStack, true), + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L)); } recipeBuilder.duration(((int) Math.max(aMaterial.getMass() / 2L, 1L)) * TICKS) .eut(2) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java index 3548bd437b..f8c5a620b0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java @@ -3,21 +3,21 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_Utility.calculateRecipeEU; +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.OrePrefixes; import gregtech.api.enums.SubTag; 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.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -30,52 +30,52 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist ItemStack aStack) { if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { - ItemStack tPlate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L); - ItemStack tRing = GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L); - if (GT_Utility.isStackValid(tPlate) && GT_Utility.isStackValid(tRing)) { + ItemStack tPlate = GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L); + ItemStack tRing = GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L); + if (GTUtility.isStackValid(tPlate) && GTUtility.isStackValid(tRing)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), + GTProxy.tBits, new Object[] { "PhP", "SRf", "PdP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial) }); } - GT_Values.RA.stdBuilder() - .itemInputs(tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(tPlate.copy(), tRing.copy(), GTUtility.getIntegratedCircuit(4)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) .fluidInputs(Materials.Tin.getMolten(32)) .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(tPlate.copy(), tRing.copy(), GTUtility.getIntegratedCircuit(4)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) .fluidInputs(Materials.Lead.getMolten(48)) .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(tPlate.copy(), tRing.copy(), GTUtility.getIntegratedCircuit(4)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(16)) .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(assemblerRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 5L), + GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 5L), ItemList.Shape_Extruder_Rotor.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(extruderRecipes); @@ -83,9 +83,9 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.mStandardMoltenFluid != null) { if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rotor.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(612L)) .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 24)) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java index 0eb2cb3dd0..95ca9eb48b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java @@ -1,19 +1,19 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import net.minecraft.item.ItemStack; import appeng.core.Api; -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.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -25,28 +25,28 @@ public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegist public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (!aMaterial.contains(SubTag.NO_WORKING)) { - if (GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + if (GTOreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .duration(((int) Math.max(aMaterial.getMass() / 4L, 1L)) * TICKS) .eut(8) .addTo(latheRecipes); } if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), + GTProxy.tBits, new Object[] { "fX", "Xh", 'X', OrePrefixes.nugget.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 4L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.round, aMaterial, 4L), + GTProxy.tBits, new Object[] { "fXh", 'X', OrePrefixes.ingot.get(aMaterial) }); } } Api.INSTANCE.registries() .matterCannon() - .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass()); + .registerAmmo(GTOreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass()); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java index b1996d067f..7d9cdc338f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java @@ -1,17 +1,17 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; 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.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class ProcessingSand implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -23,10 +23,10 @@ public class ProcessingSand implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (aOreDictName.equals("sandOil")) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Cell_Empty.get(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Cell_Empty.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), new ItemStack(Blocks.sand, 1, 0)) .duration(50 * SECONDS) .eut(5) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java index f13c2aa9b5..3dc11940e7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java @@ -3,17 +3,17 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; 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.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class ProcessingSaplings implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -24,25 +24,25 @@ public class ProcessingSaplings implements gregtech.api.interfaces.IOreRecipeReg @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(8, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(8, aStack)) .itemOutputs(ItemList.IC2_Plantball.get(1L)) .duration(15 * SECONDS) .eut(2) .addTo(compressorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Wood, 1L)) + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Wood, 1L)) .duration(16 * TICKS) .eut(8) .addTo(latheRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java index afafe8525d..23dd8ed407 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java @@ -1,20 +1,20 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_Utility.calculateRecipeEU; +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.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -26,19 +26,19 @@ public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegist public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (!aMaterial.contains(SubTag.NO_WORKING)) { - if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .duration(((int) Math.max(aMaterial.getMass() / 8L, 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(latheRecipes); } if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), + GTProxy.tBits, new Object[] { "fX", "X ", 'X', OrePrefixes.bolt.get(aMaterial) }); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 5493aa9b8e..396cce0c8c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -3,25 +3,25 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; -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.init.Blocks; import net.minecraft.init.Items; 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.SubTag; import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeCategories; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; @SuppressWarnings("RedundantLabeledSwitchRuleCodeBlock") public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -34,7 +34,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (((aMaterial == Materials.Glass) || (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null)) + if (((aMaterial == Materials.Glass) || (GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null)) && (!aMaterial.contains(SubTag.NO_SMELTING))) { long aMaterialMass = aMaterial.getMass(); int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L); @@ -50,20 +50,20 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } if (!OrePrefixes.block.isIgnored(aMaterial.mSmeltInto) - && (GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, 1L) != null) + && (GTOreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, 1L) != null) && aMaterial != Materials.Ichorium) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Shape_Extruder_Block.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Extruder_Block.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) .duration((10 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); // Allow creation of alloy smelter recipes for material recycling if < IV tier. if (tTrueVoltage < TierEU.IV) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) .duration((5 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)) .recipeCategory(RecipeCategories.alloySmelterMolding) @@ -71,74 +71,74 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } } if ((aPrefix != OrePrefixes.ingot || aMaterial != aMaterial.mSmeltInto) - && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Ingot.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, tAmount)) + && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Ingot.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, tAmount)) .duration(10 * TICKS) .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Pipe_Tiny.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, tAmount * 2)) + if (GTOreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Pipe_Tiny.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, tAmount * 2)) .duration((4 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Pipe_Small.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Pipe_Small.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, tAmount)) .duration((8 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Shape_Extruder_Pipe_Medium.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Shape_Extruder_Pipe_Medium.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, tAmount)) .duration((24 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(6, aStack), ItemList.Shape_Extruder_Pipe_Large.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(6, aStack), ItemList.Shape_Extruder_Pipe_Large.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, tAmount)) .duration((48 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(12, aStack), ItemList.Shape_Extruder_Pipe_Huge.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(12, aStack), ItemList.Shape_Extruder_Pipe_Huge.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, tAmount)) .duration((96 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Plate.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Plate.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Small_Gear.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Small_Gear.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(6, aStack), ItemList.Shape_Extruder_Turbine_Blade.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(6, aStack), ItemList.Shape_Extruder_Turbine_Blade.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); @@ -146,109 +146,109 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { if (aMaterial.mStandardMoltenFluid != null) { - if (GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ring.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(36L)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Screw.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(18L)) .duration(2 * SECONDS + 10 * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rod.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(72L)) .duration(7 * SECONDS + 10 * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Bolt.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(18L)) .duration(2 * SECONDS + 10 * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.round, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Round.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.round, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(18L)) .duration(2 * SECONDS + 10 * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rod_Long.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(144L)) .duration(15 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Turbine_Blade.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(864L)) .duration(20 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Tiny.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(72L)) .duration(1 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Small.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(144L)) .duration(2 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Medium.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(432L)) .duration(4 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Large.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(864L)) .duration(8 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Huge.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(1728L)) .duration(16 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) @@ -258,21 +258,21 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } if (tAmount * 2 <= 64 && aMaterial != Materials.Obsidian) { if (!(aMaterial == Materials.Aluminium)) { - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Rod.get(0L)) + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Rod.get(0L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2)) .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)) .addTo(extruderRecipes); } } else { - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Rod.get(0L)) + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Rod.get(0L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(extruderRecipes); @@ -280,31 +280,31 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } } if (tAmount * 2 <= 64) { - if (GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Wire.get(0L)) + if (GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Wire.get(0L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2)) + GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2)) .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)) .addTo(extruderRecipes); } } if (tAmount * 8 <= 64) { - if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Bolt.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8)) + if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Bolt.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8)) .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } } if (tAmount * 4 <= 64) { - if (GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Ring.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, tAmount * 4)) + if (GTOreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Ring.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, tAmount * 4)) .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)) .addTo(extruderRecipes); @@ -313,86 +313,84 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi && !aMaterial.contains(SubTag.NO_SMASHING)) { // If material tier < IV then add manual recipe. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV - && GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L) != null) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), - GT_Proxy.tBits, + && GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L) != null) { + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), + GTProxy.tBits, new Object[] { "h ", "fX", 'X', OrePrefixes.stick.get(aMaterial) }); } } } - if (GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Extruder_Sword.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Extruder_Sword.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Shape_Extruder_Pickaxe.get(0L)) + if (GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Shape_Extruder_Pickaxe.get(0L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, tAmount)) + GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 3L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Shovel.get(0L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Shovel.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 1L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Shape_Extruder_Axe.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Shape_Extruder_Axe.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 3L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Extruder_Hoe.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Extruder_Hoe.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(6, aStack), ItemList.Shape_Extruder_Hammer.get(0L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(6, aStack), ItemList.Shape_Extruder_Hammer.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 6L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Extruder_File.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Extruder_File.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Extruder_Saw.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Extruder_Saw.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Shape_Extruder_Gear.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Shape_Extruder_Gear.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 5L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); @@ -400,10 +398,10 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi if (!(aMaterial == Materials.StyreneButadieneRubber || aMaterial == Materials.Silicone)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Plate.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Plate.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .recipeCategory(RecipeCategories.alloySmelterMolding) @@ -413,10 +411,10 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } else { // If tier < IV then add ability to turn ingots into plates via alloy smelter. if (tTrueVoltage < TierEU.IV) { - if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Mold_Plate.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Mold_Plate.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .recipeCategory(RecipeCategories.alloySmelterMolding) @@ -427,10 +425,10 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi // If tier < IV then add ability to turn ingots into gears via alloy smelter. if (tTrueVoltage < TierEU.IV) { - if (GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(8, aStack), ItemList.Shape_Mold_Gear.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount)) + if (GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(8, aStack), ItemList.Shape_Mold_Gear.get(0L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount)) .duration(((int) Math.max(aMaterialMass * 10L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .recipeCategory(RecipeCategories.alloySmelterMolding) @@ -440,69 +438,69 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi switch (aMaterial.mSmeltInto.mName) { case "Glass" -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Bottle.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Bottle.get(0L)) .itemOutputs(new ItemStack(Items.glass_bottle, 1)) .duration((tAmount * 32) * TICKS) .eut(16) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Mold_Bottle.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Mold_Bottle.get(0L)) .itemOutputs(new ItemStack(Items.glass_bottle, 1)) .duration((tAmount * 64) * TICKS) .eut(4) .addTo(alloySmelterRecipes); } case "Steel" -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L)) .itemOutputs(ItemList.Cell_Empty.get(tAmount)) .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(extruderRecipes); if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casingadviron", tAmount * 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casingadviron", tAmount * 2)) .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(extruderRecipes); } if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casingadviron", tAmount * 3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casingadviron", tAmount * 3)) .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(alloySmelterRecipes); } } case "Iron", "WroughtIron" -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", tAmount)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("fuelRod", tAmount)) .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(extruderRecipes); if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casingiron", tAmount * 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casingiron", tAmount * 2)) .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(extruderRecipes); } if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casingiron", tAmount * 3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casingiron", tAmount * 3)) .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(alloySmelterRecipes); } if (tAmount * 31 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(31, aStack), ItemList.Shape_Mold_Anvil.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(31, aStack), ItemList.Shape_Mold_Anvil.get(0L)) .itemOutputs(new ItemStack(Blocks.anvil, 1, 0)) .duration((tAmount * 512) * TICKS) .eut(4 * tVoltageMultiplier) @@ -510,24 +508,24 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } } case "Tin" -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Extruder_Cell.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Extruder_Cell.get(0L)) .itemOutputs(ItemList.Cell_Empty.get(tAmount)) .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(extruderRecipes); if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casingtin", tAmount * 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casingtin", tAmount * 2)) .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(extruderRecipes); } if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casingtin", tAmount * 3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casingtin", tAmount * 3)) .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(alloySmelterRecipes); @@ -535,17 +533,17 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } case "Lead" -> { if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casinglead", tAmount * 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casinglead", tAmount * 2)) .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(extruderRecipes); } if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casinglead", tAmount * 3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casinglead", tAmount * 3)) .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(alloySmelterRecipes); @@ -553,17 +551,17 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } case "Copper", "AnnealedCopper" -> { if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casingcopper", tAmount * 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casingcopper", tAmount * 2)) .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(extruderRecipes); } if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casingcopper", tAmount * 3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casingcopper", tAmount * 3)) .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(alloySmelterRecipes); @@ -571,17 +569,17 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } case "Bronze" -> { if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casingbronze", tAmount * 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casingbronze", tAmount * 2)) .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(extruderRecipes); } if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casingbronze", tAmount * 3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casingbronze", tAmount * 3)) .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(alloySmelterRecipes); @@ -589,25 +587,25 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } case "Gold" -> { if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casinggold", tAmount * 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casinggold", tAmount * 2)) .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(extruderRecipes); } if (tAmount * 2 <= 64) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GT_ModHandler.getIC2Item("casinggold", tAmount * 3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) + .itemOutputs(GTModHandler.getIC2Item("casinggold", tAmount * 3)) .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(alloySmelterRecipes); } } case "Polytetrafluoroethylene" -> { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L)) .itemOutputs(ItemList.Cell_Empty.get(tAmount * 4)) .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java index 35947755d3..d4f7ed4f7e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java @@ -2,15 +2,15 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; -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.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; public class ProcessingSlab implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -23,8 +23,8 @@ public class ProcessingSlab implements gregtech.api.interfaces.IOreRecipeRegistr ItemStack aStack) { if (aOreDictName.startsWith("slabWood")) { if (Railcraft.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack)) .itemOutputs(ItemList.RC_Tie_Wood.get(3L)) .fluidInputs(Materials.Creosote.getFluid(300L)) .duration(10 * SECONDS) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java index e5aac7bfe7..d04ffd1190 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java @@ -4,21 +4,21 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -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.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -30,33 +30,33 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L), + GTModHandler.RecipeBits.BUFFERED, new Object[] { " s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial) }); } if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_WORKING)) { - if ((aMaterial.contains(SubTag.CRYSTAL) ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) - : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) != null - && GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 1L) != null) { - GT_Values.RA.stdBuilder() + if ((aMaterial.contains(SubTag.CRYSTAL) ? GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) + : GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) != null + && GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - aMaterial.contains(SubTag.CRYSTAL) ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) - : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) + aMaterial.contains(SubTag.CRYSTAL) ? GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) + : GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L)) .duration(((int) Math.max(aMaterial.getMass() * 5L, 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(latheRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L)) .fluidInputs( Materials.Water.getFluid( Math.max( @@ -70,11 +70,11 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist .eut(calculateRecipeEU(aMaterial, 4)) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L)) .fluidInputs( - GT_ModHandler.getDistilledWater( + GTModHandler.getDistilledWater( Math.max( 3, Math.min( @@ -86,9 +86,9 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist .eut(calculateRecipeEU(aMaterial, 4)) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L)) .fluidInputs( Materials.Lubricant.getFluid( Math.max( @@ -104,13 +104,13 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), + GTProxy.tBits, new Object[] { "s", "X", 'X', OrePrefixes.stickLong.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), + GTProxy.tBits, new Object[] { "f ", " X", 'X', OrePrefixes.ingot.get(aMaterial) }); } } @@ -118,20 +118,20 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { // bender recipe { - if (GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L)) + if (GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(benderRecipes); } } - if (GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L)) + if (GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L)) .duration(Math.max(aMaterial.getMass(), 1L)) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(hammerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java index 1f00300264..02253bb5a3 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java @@ -2,21 +2,21 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; -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.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -28,17 +28,17 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), + GTModHandler.RecipeBits.BUFFERED, new Object[] { " s ", "fSx", " S ", 'S', OrePrefixes.stickLong.get(aMaterial) }); } if (!aMaterial.contains(SubTag.NO_WORKING)) { - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L)) + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L)) .fluidInputs( Materials.Water.getFluid( Math.max( @@ -51,11 +51,11 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe .eut(calculateRecipeEU(aMaterial, 4)) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L)) .fluidInputs( - GT_ModHandler.getDistilledWater( + GTModHandler.getDistilledWater( Math.max( 3, Math.min( @@ -66,9 +66,9 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe .eut(calculateRecipeEU(aMaterial, 4)) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L)) .fluidInputs( Materials.Lubricant.getFluid( Math.max( @@ -84,13 +84,13 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), + GTProxy.tBits, new Object[] { "sf", "G ", 'G', OrePrefixes.gemFlawless.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L), + GTProxy.tBits, new Object[] { "sf", "G ", 'G', OrePrefixes.gemExquisite.get(aMaterial) }); } } @@ -98,10 +98,10 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe if (!aMaterial.contains(SubTag.NO_SMASHING)) { // Bender recipes { - if (GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L)) + if (GTOreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(benderRecipes); @@ -110,9 +110,9 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), + GTProxy.tBits, new Object[] { "ShS", 'S', OrePrefixes.stick.get(aMaterial) }); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java index 840f49b4dd..da21829d0c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java @@ -3,21 +3,21 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; 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.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; 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.TierEU; import gregtech.api.interfaces.IOreRecipeRegistrator; -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 ProcessingStone implements IOreRecipeRegistrator { @@ -28,11 +28,11 @@ public class ProcessingStone implements IOreRecipeRegistrator { @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - Block aBlock = GT_Utility.getBlockFromStack(aStack); + Block aBlock = GTUtility.getBlockFromStack(aStack); switch (aMaterial.mName) { case "NULL": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(3, aStack), new ItemStack(Blocks.redstone_torch, 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.redstone_torch, 2)) .itemOutputs(new ItemStack(Items.repeater, 1)) .fluidInputs(Materials.Redstone.getMolten(144L)) .duration(5 * SECONDS) @@ -40,38 +40,38 @@ public class ProcessingStone implements IOreRecipeRegistrator { .addTo(assemblerRecipes); break; case "Sand": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs(new ItemStack(Blocks.sand, 1, 0)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); break; case "Endstone": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Endstone, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tungstate, 1L)) + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Endstone, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tungstate, 1L)) .outputChances(10000, 500) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); break; case "Netherrack": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Netherrack, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L)) + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Netherrack, 1L), + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L)) .outputChances(10000, 500) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); break; case "NetherBrick": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) .itemOutputs(new ItemStack(Blocks.nether_brick_fence, 1)) .duration(5 * SECONDS) .eut(4) @@ -81,54 +81,54 @@ public class ProcessingStone implements IOreRecipeRegistrator { if (aBlock != Blocks.air) aBlock.setResistance(20.0F); break; case "Concrete": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 200 * 30 / 320)))) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 200 * 30 / 426)))) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, 200 * 30 / 426)))) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 100 * 30 / 1280)))) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); break; case "Rhyolite": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartz, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quartz, 1L)) .outputChances(10000, 2000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); break; case "Komatiite": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Biotite, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Biotite, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1L)) .outputChances(10000, 500) .duration(20 * SECONDS) .eut(2) @@ -136,44 +136,44 @@ public class ProcessingStone implements IOreRecipeRegistrator { break; case "Dacite": case "Andesite": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L)) .outputChances(10000, 2000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); break; case "Gabbro": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrite, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Pyrite, 1L)) .outputChances(10000, 2000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); break; case "Eclogite": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rutile, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rutile, 1L)) .outputChances(10000, 1000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); break; case "Soapstone": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Talc, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Chromite, 1L)) + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Talc, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Chromite, 1L)) .outputChances(10000, 1000) .duration(20 * SECONDS) .eut(2) @@ -181,11 +181,11 @@ public class ProcessingStone implements IOreRecipeRegistrator { break; case "Greenschist": case "Blueschist": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Glauconite, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1L)) + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Glauconite, 2L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1L)) .outputChances(10000, 1000) .duration(20 * SECONDS) .eut(2) @@ -193,11 +193,11 @@ public class ProcessingStone implements IOreRecipeRegistrator { break; case "Gneiss": case "Migmatite": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.GraniteBlack, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.GraniteBlack, 1L)) .outputChances(10000, 5000) .duration(20 * SECONDS) .eut(2) @@ -205,69 +205,69 @@ public class ProcessingStone implements IOreRecipeRegistrator { break; case "Redrock": case "Marble": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320)))) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280)))) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); case "Basalt": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320)))) .duration(20 * SECONDS) .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, 1L)) - .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) .duration(20 * SECONDS) .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, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280)))) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); case "Quartzite": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) .outputChances(10000, 1000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); break; case "Flint": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 2L), + GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 2L), new ItemStack(Items.flint, 1)) .outputChances(10000, 5000) .duration(20 * SECONDS) @@ -275,70 +275,70 @@ public class ProcessingStone implements IOreRecipeRegistrator { .addTo(maceratorRecipes); break; case "GraniteBlack": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320)))) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280)))) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L)) + GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L)) .outputChances(10000, 100) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); break; case "GraniteRed": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320)))) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280)))) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 1L)) + GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 1L)) .outputChances(10000, 100) .duration(20 * SECONDS) .eut(2) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java index fb9431e8e4..f764ebd4a8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java @@ -1,15 +1,15 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; 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.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; public class ProcessingStoneCobble implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -20,8 +20,8 @@ public class ProcessingStoneCobble implements gregtech.api.interfaces.IOreRecipe @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(8, aStack), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(8, aStack), GTUtility.getIntegratedCircuit(8)) .itemOutputs(new ItemStack(Blocks.furnace, 1)) .duration(20 * SECONDS) .eut(4) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index db3175279d..888c6221af 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -4,25 +4,25 @@ import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.formingPressRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +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.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.common.GT_Proxy; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gregtech.common.items.ID_MetaTool_01; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; +import gregtech.common.items.IDMetaTool01; +import gregtech.common.items.MetaGeneratedTool01; public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH OLD TOOL // HEAD??? generator @@ -58,460 +58,460 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg || aMaterial.contains(SubTag.SOFT); switch (aPrefix) { case toolHeadAxe -> { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.AXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.AXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(2)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GTUtility.getIntegratedCircuit(2)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.AXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.AXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); } - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GTProxy.tBits, new Object[] { "PIh", "P ", "f ", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Proxy.tBits, + if (!aNoWorking) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GTProxy.tBits, new Object[] { "GG ", "G ", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); } case toolHeadBuzzSaw -> { - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.BUZZSAW_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.BUZZSAW_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.BUZZSAW_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.BUZZSAW_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 75000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.BUZZSAW_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.BUZZSAW_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 50000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.BUZZSAW_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.BUZZSAW_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.BUZZSAW_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.BUZZSAW_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 300000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.BUZZSAW_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.BUZZSAW_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 200000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.BUZZSAW_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.BUZZSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.BUZZSAW_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.BUZZSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1200000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.BUZZSAW_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.BUZZSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 800000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Sodium.get(1L) }); - if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq2) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), + GTProxy.tBits, new Object[] { "wXh", "X X", "fXx", 'X', OrePrefixes.plate.get(aMaterial) }); } case toolHeadChainsaw -> { - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.CHAINSAW_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.CHAINSAW_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.CHAINSAW_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.CHAINSAW_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 75000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.CHAINSAW_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.CHAINSAW_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 50000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.CHAINSAW_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.CHAINSAW_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.CHAINSAW_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.CHAINSAW_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 300000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.CHAINSAW_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.CHAINSAW_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 200000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.CHAINSAW_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.CHAINSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.CHAINSAW_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.CHAINSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1200000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.CHAINSAW_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.CHAINSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 800000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Sodium.get(1L) }); - if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq2) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L), + GTProxy.tBits, new Object[] { "SRS", "XhX", "SRS", 'X', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel) }); } case toolHeadDrill -> { - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.DRILL_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.DRILL_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 100_000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.DRILL_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.DRILL_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 75_000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.DRILL_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.DRILL_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 50_000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.DRILL_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.DRILL_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 400_000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.DRILL_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.DRILL_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 300_000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.DRILL_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.DRILL_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 200_000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.DRILL_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.DRILL_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1_600_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.DRILL_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.DRILL_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1_200_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.DRILL_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.DRILL_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 800_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.JACKHAMMER.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.JACKHAMMER.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1_600_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Piston_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'R', OrePrefixes.spring.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.JACKHAMMER.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.JACKHAMMER.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1_200_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Piston_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'R', OrePrefixes.spring.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.JACKHAMMER.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.JACKHAMMER.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 800_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Piston_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'R', OrePrefixes.spring.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Sodium.get(1L) }); if (aSpecialRecipeReq2) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), + GTProxy.tBits, new Object[] { "XSX", "XSX", "ShS", 'X', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.plate.get(Materials.Steel) }); if (aMaterial.mStandardMoltenFluid != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_ToolHeadDrill.get(0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(144 * 4)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(fluidSolidifierRecipes); } - if (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 4L), + GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 4L), ItemList.Shape_Extruder_ToolHeadDrill.get(0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(extruderRecipes); @@ -520,40 +520,36 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg } case toolHeadFile -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.FILE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.FILE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if ((!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.BOUNCY))) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.FILE.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.FILE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), - GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.MIRRORED | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "P", "P", "S", 'P', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } } } - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(15)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L), + GTUtility.getIntegratedCircuit(15)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.FILE.ID, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null)) + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.FILE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(assemblerRecipes); @@ -561,62 +557,62 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg } case toolHeadHoe -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.HOE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.HOE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(16)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GTUtility.getIntegratedCircuit(16)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.HOE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.HOE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(assemblerRecipes); } - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GTProxy.tBits, new Object[] { "PIh", "f ", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Proxy.tBits, + if (!aNoWorking) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GTProxy.tBits, new Object[] { "GG ", "f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); } case toolHeadPickaxe -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.PICKAXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.PICKAXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GTProxy.tBits, new Object[] { "PII", "f h", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Proxy.tBits, + if (!aNoWorking) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GTProxy.tBits, new Object[] { "GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); } - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(5)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GTUtility.getIntegratedCircuit(5)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.PICKAXE.ID, + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.PICKAXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -629,34 +625,30 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadPlow -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.PLOW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.PLOW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GTProxy.tBits, new Object[] { "PP", "PP", "hf", 'P', OrePrefixes.plate.get(aMaterial) }); - if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Proxy.tBits, + if (!aNoWorking) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GTProxy.tBits, new Object[] { "GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial) }); } - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(6)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GTUtility.getIntegratedCircuit(6)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.PLOW.ID, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null)) + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.PLOW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(assemblerRecipes); @@ -665,31 +657,31 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadSaw -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SAW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SAW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GTProxy.tBits, new Object[] { "PP ", "fh ", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Proxy.tBits, + if (!aNoWorking) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GTProxy.tBits, new Object[] { "GGf", 'G', OrePrefixes.gem.get(aMaterial) }); } - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(7)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GTUtility.getIntegratedCircuit(7)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SAW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SAW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(assemblerRecipes); @@ -698,54 +690,50 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadSense -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SENSE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SENSE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GTProxy.tBits, new Object[] { "PPI", "hf ", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Proxy.tBits, + if (!aNoWorking) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GTProxy.tBits, new Object[] { "GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); } - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(8)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GTUtility.getIntegratedCircuit(8)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SENSE.ID, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null)) + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SENSE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(assemblerRecipes); } } case toolHeadShovel -> { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SHOVEL.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SHOVEL.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(9)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GTUtility.getIntegratedCircuit(9)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SHOVEL.ID, + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SHOVEL.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -754,70 +742,66 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(assemblerRecipes); } - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GTProxy.tBits, new Object[] { "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Proxy.tBits, + if (!aNoWorking) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GTProxy.tBits, new Object[] { "fG", 'G', OrePrefixes.gem.get(aMaterial) }); } case toolHeadSword -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SWORD.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SWORD.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GTProxy.tBits, new Object[] { " P ", "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Proxy.tBits, + if (!aNoWorking) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GTProxy.tBits, new Object[] { " G", "fG", 'G', OrePrefixes.gem.get(aMaterial) }); } - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(10)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GTUtility.getIntegratedCircuit(10)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SWORD.ID, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null)) + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SWORD.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(assemblerRecipes); } } case toolHeadUniversalSpade -> { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.UNIVERSALSPADE.ID, 1, aMaterial, aMaterial, null), + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.UNIVERSALSPADE.ID, 1, aMaterial, aMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial), OrePrefixes.screw.get(aMaterial), ToolDictNames.craftingToolScrewdriver }); - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null - && GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null + && GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(11)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), + GTUtility.getIntegratedCircuit(11)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.UNIVERSALSPADE.ID, + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.UNIVERSALSPADE.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -826,268 +810,268 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(assemblerRecipes); } - if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq2) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), + GTProxy.tBits, new Object[] { "fX", 'X', OrePrefixes.toolHeadShovel.get(aMaterial) }); } case toolHeadWrench -> { - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.WRENCH_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.WRENCH_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.WRENCH_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.WRENCH_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 75000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.WRENCH_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.WRENCH_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 50000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.WRENCH_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.WRENCH_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.WRENCH_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.WRENCH_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 300000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.WRENCH_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.WRENCH_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 200000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.WRENCH_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.WRENCH_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.WRENCH_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.WRENCH_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1200000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.WRENCH_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.WRENCH_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 800000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SCREWDRIVER_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SCREWDRIVER_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SCREWDRIVER_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SCREWDRIVER_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 75000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SCREWDRIVER_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SCREWDRIVER_LV.ID, 1, aMaterial, Materials.Steel, new long[] { 50000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SCREWDRIVER_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SCREWDRIVER_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SCREWDRIVER_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SCREWDRIVER_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 300000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SCREWDRIVER_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SCREWDRIVER_MV.ID, 1, aMaterial, Materials.Aluminium, new long[] { 200000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Sodium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SCREWDRIVER_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SCREWDRIVER_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SCREWDRIVER_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SCREWDRIVER_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 1200000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Cadmium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SCREWDRIVER_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SCREWDRIVER_HV.ID, 1, aMaterial, Materials.StainlessSteel, new long[] { 800000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Sodium.get(1L) }); - if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L), - GT_Proxy.tBits, + if (aSpecialRecipeReq2) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L), + GTProxy.tBits, new Object[] { "hXW", "XRX", "WXd", 'X', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel), 'W', OrePrefixes.screw.get(Materials.Steel) }); } case toolHeadHammer, toolHeadMallet -> { - if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(14)) + GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), + GTUtility.getIntegratedCircuit(14)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID, + MetaGeneratedTool01.INSTANCE.getToolWithStats( + aProducesSoftMallet ? IDMetaTool01.SOFTMALLET.ID : IDMetaTool01.HARDHAMMER.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -1097,84 +1081,84 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg .addTo(assemblerRecipes); } if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID, + GTModHandler.addShapelessCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + aProducesSoftMallet ? IDMetaTool01.SOFTMALLET.ID : IDMetaTool01.HARDHAMMER.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + aProducesSoftMallet ? IDMetaTool01.SOFTMALLET.ID : IDMetaTool01.HARDHAMMER.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "XX ", "XXS", "XX ", 'X', aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood) : OrePrefixes.ingot.get(aMaterial), 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + aProducesSoftMallet ? IDMetaTool01.SOFTMALLET.ID : IDMetaTool01.HARDHAMMER.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "XX ", "XXS", "XX ", 'X', aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood) : OrePrefixes.gem.get(aMaterial), 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } - if (aPrefix == OrePrefixes.toolHeadHammer) if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), - GT_Proxy.tBits, + if (aPrefix == OrePrefixes.toolHeadHammer) if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), + GTProxy.tBits, new Object[] { "II ", "IIh", "II ", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) }); } case turbineBlade -> { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L)) - .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(170, 1, aMaterial, aMaterial, null)) + GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L)) + .itemOutputs(MetaGeneratedTool01.INSTANCE.getToolWithStats(170, 1, aMaterial, aMaterial, null)) .duration(8 * SECONDS) .eut(calculateRecipeEU(aMaterial, 100)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 8L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1L)) - .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(172, 1, aMaterial, aMaterial, null)) + GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 8L), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1L)) + .itemOutputs(MetaGeneratedTool01.INSTANCE.getToolWithStats(172, 1, aMaterial, aMaterial, null)) .duration(16 * SECONDS) .eut(calculateRecipeEU(aMaterial, 400)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 12L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1L)) - .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(174, 1, aMaterial, aMaterial, null)) + GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 12L), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1L)) + .itemOutputs(MetaGeneratedTool01.INSTANCE.getToolWithStats(174, 1, aMaterial, aMaterial, null)) .duration(32 * SECONDS) .eut(calculateRecipeEU(aMaterial, 1600)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 16L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1L)) - .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null)) + GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 16L), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1L)) + .itemOutputs(MetaGeneratedTool01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null)) .duration(1 * MINUTES + 4 * SECONDS) .eut(calculateRecipeEU(aMaterial, 6400)) .addTo(assemblerRecipes); if (aSpecialRecipeReq2) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), + GTProxy.tBits, new Object[] { "fPd", "SPS", " P ", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plateDouble.get(aMaterial), @@ -1182,13 +1166,13 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg } // Turbine blades - if (GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null - && GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null + && GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 2L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 3L), + GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 2L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 60)) .addTo(formingPressRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java index cbb0ca3668..04aac52d4f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java @@ -8,9 +8,9 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_ModHandler; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gregtech.common.items.ID_MetaTool_01; +import gregtech.api.util.GTModHandler; +import gregtech.common.items.IDMetaTool01; +import gregtech.common.items.MetaGeneratedTool01; public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -28,10 +28,10 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe if (aMaterial != Materials.Rubber) { // Crafting recipes { - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.PLUNGER.ID, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.PLUNGER.ID, 1, aMaterial, aMaterial, null), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "xRR", " SR", "S f", 'S', OrePrefixes.stick.get(aMaterial), 'R', OrePrefixes.plate.get(Materials.AnyRubber) }); } @@ -41,89 +41,87 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe && (!aMaterial.contains(SubTag.NO_SMASHING))) { // Crafting recipes { - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.WRENCH.ID, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.WRENCH.ID, 1, aMaterial, aMaterial, null), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.CROWBAR.ID, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.CROWBAR.ID, 1, aMaterial, aMaterial, null), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SCREWDRIVER.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SCREWDRIVER.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { " fS", " Sh", "W ", 'S', OrePrefixes.stick.get(aMaterial), 'W', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.WIRECUTTER.ID, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.WIRECUTTER.ID, 1, aMaterial, aMaterial, null), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PfP", "hPd", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SCOOP.ID, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.SCOOP.ID, 1, aMaterial, aMaterial, null), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SWS", "SSS", "xSh", 'S', OrePrefixes.stick.get(aMaterial), 'W', new ItemStack(Blocks.wool, 1, 32767) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.BRANCHCUTTER.ID, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.BRANCHCUTTER.ID, 1, aMaterial, aMaterial, null), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PfP", "PdP", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.KNIFE.ID, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.KNIFE.ID, 1, aMaterial, aMaterial, null), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.BUTCHERYKNIFE.ID, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.BUTCHERYKNIFE.ID, 1, aMaterial, aMaterial, null), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PPf", "PP ", "Sh ", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SOLDERING_IRON_LV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SOLDERING_IRON_LV.ID, 1, aMaterial, Materials.Rubber, new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Iron), 'L', ItemList.Battery_RE_LV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SOLDERING_IRON_MV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SOLDERING_IRON_MV.ID, 1, aMaterial, Materials.Rubber, new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Steel), 'L', ItemList.Battery_RE_MV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - ID_MetaTool_01.SOLDERING_IRON_HV.ID, + GTModHandler.addCraftingRecipe( + MetaGeneratedTool01.INSTANCE.getToolWithStats( + IDMetaTool01.SOLDERING_IRON_HV.ID, 1, aMaterial, Materials.AnySyntheticRubber, new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', OrePrefixes.plate.get(Materials.AnySyntheticRubber), 'S', OrePrefixes.stick.get(Materials.StainlessSteel), 'L', ItemList.Battery_RE_HV_Lithium.get(1L) }); - GT_ModHandler.addCraftingRecipe( - (GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.POCKET_MULTITOOL.ID, 1, aMaterial, aMaterial, null)), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.addCraftingRecipe( + (MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.POCKET_MULTITOOL.ID, 1, aMaterial, aMaterial, null)), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "ABC", "DEF", "CFG", 'A', OrePrefixes.stickLong.get(aMaterial), 'B', OrePrefixes.toolHeadSaw.get(aMaterial), 'C', OrePrefixes.ring.get(aMaterial), 'D', OrePrefixes.toolHeadFile.get(aMaterial), 'E', OrePrefixes.plate.get(aMaterial), 'F', diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java index 4e3febc469..8d72819d26 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java @@ -2,18 +2,18 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; import static gregtech.api.recipe.RecipeMaps.polarizerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; 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.TierEU; import gregtech.api.interfaces.IOreRecipeRegistrator; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class ProcessingTransforming implements IOreRecipeRegistrator { @@ -35,13 +35,13 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Wood" -> // Chemical bath recipes { - if (GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L)) + if (GTOreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L)) .fluidInputs( Materials.SeedOil - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true))) + .getFluid(GTUtility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true))) .duration(5 * SECONDS) .eut(TierEU.ULV) .addTo(chemicalBathRecipes); @@ -51,13 +51,13 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Iron" -> { // Chemical bath recipes { - if (GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) + if (GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) .fluidInputs( - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true))) + Materials.FierySteel + .getFluid(GTUtility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true))) .duration(5 * SECONDS) .eut(TierEU.ULV) .addTo(chemicalBathRecipes); @@ -66,11 +66,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { // Polarizer recipes { - if (GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L)) - .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) + if (GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L)) + .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.LV / 2) .addTo(polarizerRecipes); } @@ -79,13 +79,13 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "WroughtIron" -> { // Chemical bath recipes { - if (GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) + if (GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) .fluidInputs( - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true))) + Materials.FierySteel + .getFluid(GTUtility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true))) .duration(5 * SECONDS) .eut(TierEU.ULV) .addTo(chemicalBathRecipes); @@ -94,11 +94,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { // Polarizer recipes { - if (GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L)) - .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) + if (GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L)) + .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.LV / 2) .addTo(polarizerRecipes); } @@ -107,13 +107,13 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Steel" -> { // Chemical Bath recipes { - if (GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) + if (GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) .fluidInputs( - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true))) + Materials.FierySteel + .getFluid(GTUtility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true))) .duration(5 * SECONDS) .eut(TierEU.ULV) .addTo(chemicalBathRecipes); @@ -122,11 +122,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { // Polarizer recipes { - if (GT_OreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L)) - .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) + if (GTOreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L)) + .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.LV / 2) .addTo(polarizerRecipes); } @@ -135,11 +135,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Neodymium" -> // Polarizer recipes { - if (GT_OreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L)) - .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) + if (GTOreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L)) + .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.HV / 2) .addTo(polarizerRecipes); } @@ -147,11 +147,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Samarium" -> // Polarizer recipes { - if (GT_OreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L)) - .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) + if (GTOreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L)) + .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.IV / 2) .addTo(polarizerRecipes); } @@ -160,11 +160,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "TengamPurified" -> // Polarizer recipes { - if (GT_OreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L)) - .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) + if (GTOreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L)) + .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.RECIPE_UHV) .addTo(polarizerRecipes); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java index 7635546d23..41f5511754 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java @@ -1,15 +1,15 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; 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_RecipeConstants; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; public class ProcessingWax implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -21,11 +21,11 @@ public class ProcessingWax implements gregtech.api.interfaces.IOreRecipeRegistra public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (aOreDictName.equals("waxMagical")) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, 6) .metadata(FUEL_TYPE, 5) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index 1f5bd5f1c2..c38c8fb72b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -6,9 +6,9 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.packagerRecipes; import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes; import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; -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 java.util.ArrayList; @@ -16,16 +16,16 @@ import net.minecraft.item.ItemStack; import appeng.api.config.TunnelType; import appeng.core.Api; -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.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -64,10 +64,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (!aMaterial.contains(SubTag.NO_SMASHING)) { // Bender recipes { - if (GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L)) + if (GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(benderRecipes); @@ -76,10 +76,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr // Wiremill Recipes { - if (GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L)) + if (GTOreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(wiremillRecipes); @@ -91,42 +91,42 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING) && (aMaterial.getProcessingMaterialTierEU() < TierEU.IV)) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), - GT_Proxy.tBits, + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), + GTProxy.tBits, new Object[] { "Xx", 'X', OrePrefixes.plate.get(aMaterial) }); } // Assembler recipes { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L)) .duration(7 * SECONDS + 10 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), GTUtility.getIntegratedCircuit(4)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(8, aStack), GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(8, aStack), GTUtility.getIntegratedCircuit(8)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L)) .duration(15 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(12, aStack), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(12, aStack), GTUtility.getIntegratedCircuit(12)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L)) .duration(20 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, aStack), GT_Utility.getIntegratedCircuit(16)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, aStack), GTUtility.getIntegratedCircuit(16)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L)) .duration(25 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(assemblerRecipes); @@ -138,12 +138,12 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { // Shapeless crafting recipes { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), + GTModHandler.addShapelessCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), new Object[] { aOreDictName }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); } } @@ -154,15 +154,15 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { // Shapeless crafting recipes { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), + GTModHandler.addShapelessCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), new Object[] { aOreDictName }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), new Object[] { OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial) }); } } @@ -173,17 +173,17 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { // Shapeless crafting recipes { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), + GTModHandler.addShapelessCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), new Object[] { aOreDictName }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), new Object[] { OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } } @@ -194,11 +194,11 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { // Shapeless crafting recipes { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L), + GTModHandler.addShapelessCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L), new Object[] { aOreDictName }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } } @@ -209,14 +209,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { // Shapeless crafting recipes { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L), + GTModHandler.addShapelessCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L), new Object[] { aOreDictName }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt08.get(aMaterial) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(1, aStack), new Object[] { OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } @@ -224,7 +224,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } } default -> { - GT_Log.err.println( + GTLog.err.println( "OrePrefix " + aPrefix.name() + " cannot be registered as a cable for Material " + aMaterial.mName); return; } @@ -241,72 +241,72 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } // shapeless crafting - if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { + GTModHandler.addShapelessCraftingRecipe( + GTOreDictUnificator.get(correspondingCable, aMaterial, 1L), craftingListRubber.toArray()); } // Packer recipe - if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() + if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(1, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Rubber), costMultiplier)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + GTUtility.copyAmount(1, aStack), + GTOreDictUnificator.get(OrePrefixes.plate.get(Materials.Rubber), costMultiplier)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .duration(5 * SECONDS) .eut(8) .addTo(packagerRecipes); } // alloy smelter recipes { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), + GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L)) .duration(5 * SECONDS) .eut(8) .addTo(alloySmelterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), + GTOreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L)) .duration(10 * SECONDS) .eut(16) .addTo(alloySmelterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L), + GTOreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(alloySmelterRecipes); } // Assembler recipes { - if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(aStack, GTUtility.getIntegratedCircuit(24)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Rubber.getMolten(144L * costMultiplier)) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(aStack, GTUtility.getIntegratedCircuit(24)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.StyreneButadieneRubber.getMolten(108L * costMultiplier)) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(aStack, GTUtility.getIntegratedCircuit(24)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Silicone.getMolten(72L * costMultiplier)) .duration(5 * SECONDS) .eut(8) @@ -315,17 +315,17 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), dielectric.getDust(costMultiplier)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 4L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L)) .duration(20 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack, dielectric.getDustSmall(costMultiplier)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L)) .duration(5 * SECONDS) .eut(8) @@ -337,29 +337,29 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } case "Iron", "Nickel", "Cupronickel", "Copper", "AnnealedCopper", "Kanthal", "Gold", "Electrum", "Silver", "Nichrome", "Steel", "BlackSteel", "Titanium", "Aluminium", "BlueAlloy", "NetherStar", "RedstoneAlloy" -> { - if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) == null) { + if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) == null) { break; } // Assembler recipes - GT_Values.RA.stdBuilder() - .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(aStack, GTUtility.getIntegratedCircuit(24)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Rubber.getMolten(144 * costMultiplier)) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(aStack, GTUtility.getIntegratedCircuit(24)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.StyreneButadieneRubber.getMolten(108 * costMultiplier)) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + GTValues.RA.stdBuilder() + .itemInputs(aStack, GTUtility.getIntegratedCircuit(24)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Silicone.getMolten(72 * costMultiplier)) .duration(5 * SECONDS) .eut(8) @@ -368,17 +368,17 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aStack), dielectric.getDust(costMultiplier)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 4L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L)) .duration(20 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aStack, dielectric.getDustSmall(costMultiplier)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L)) .duration(5 * SECONDS) .eut(8) @@ -388,28 +388,28 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } default -> { - if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) == null) { + if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) == null) { break; } // Assembler recipes - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aStack, - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier), - GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier), + GTUtility.getIntegratedCircuit(24)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Silicone.getMolten(costMultiplier * 72)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aStack, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier), - GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier), + GTUtility.getIntegratedCircuit(24)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Silicone.getMolten(costMultiplier * 72)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) @@ -418,44 +418,44 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(4, aStack), + GTUtility.copyAmount(4, aStack), dielectric.getDust(costMultiplier), - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4L)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L)) + GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4L)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 4L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L)) .duration(20 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(4, aStack), + GTUtility.copyAmount(4, aStack), dielectric.getDust(costMultiplier), - GT_OreDictUnificator + GTOreDictUnificator .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier * 4L)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 4L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L)) .duration(20 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aStack, dielectric.getDustSmall(costMultiplier), - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aStack, dielectric.getDustSmall(costMultiplier), - GT_OreDictUnificator + GTOreDictUnificator .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier)) - .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) @@ -465,16 +465,16 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } } - if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) + if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) + .itemOutputs(GTUtility.copyAmount(1, aStack)) .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(unpackagerRecipes); } - if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { + if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { AE2AddNetAttunementCable(aStack, correspondingCable, aMaterial); } } @@ -500,7 +500,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .addNewAttunement(aStack, (TunnelType) tt); Api.INSTANCE.registries() .p2pTunnel() - .addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt); + .addNewAttunement(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt); } // end region } |