From f74c7cc297d1d19d38a19683cd277ad9ce605d3a Mon Sep 17 00:00:00 2001 From: miozune Date: Mon, 4 Dec 2023 05:34:27 +0900 Subject: Refactor RecipeMap (#2345) * Remove deprecated and unused things * Move recipemap subclasses * Move GT_Recipe_Map to outside and rename to RecipeMap * Move recipemap instances to separated class & remove prepending s * Remove useless GT_Recipe constructors * Always use ModularUI * Rename IGT_RecipeMap -> IRecipeMap * Add RecipeMapBuilder * Remove more deprecated and unused things * Fix RecipeMap type parameters * Use multimap for recipe index * Fix bending recipe error in dev env * Remove mUniqueIdentifier * Update AE2FC * Less edgy texture for NEI recipe background * Add replicator fluid output slot for NEI and machine GUI * Fix fluid fuels not having fuel value in large boilers * Remove GT_RectHandler and NEI_TransferRectHost * Remove RecipeMapHandler * Move NEI energy description from RecipeMapFrontend to Power * Refactor the way to filter fusion recipes * Check restriction for some properties * Remove showVoltageAmperage * Make Power accept GT_Recipe * Fix NPE * Move NEI duration description to Power from Frontend * Directly implement IRecipeProcessingAwareHatch for GT_MetaTileEntity_Hatch_InputBus_ME * Make Power integrated with GT_OverclockCalculator * Rename Power -> OverclockDescriber * Don't modify recipe find logic until postload finishes * Reformat reserved MTE ids * Fix check for too few inputs on recipe addition * Move replicator logic to backend * Stop un-hiding assline recipes * Allow setting custom recipe comparator & implement for fusion * Update AE2FC * Rename getRecipeList and getRecipes -> getRecipeMap * Automatically register recipe catalysts * Cleanup the way to detect recipe collision * Make use of BasicUIProperties for basic machines * Make use of BasicUIProperties for UIHelper * Rename specialHandler -> recipeTransformer * Add way to automatically register handler info * Add recipe category * Add some APIs for addons * Rename blastRecipes -> blastFurnaceRecipes * Remove GT_MetaTileEntity_BasicMachine_GT_Recipe#mSharedTank and #mRequiresFluidForFiltering * Don't require setting duration and EU/t for fuel recipes * Don't require setting EU/t for primitive blast furnace recipes * Revert change to addMultiblockChemicalRecipe * Fix large boiler general desc recipe not being added * Hide duration and EU/t from large boiler * Cleanup recipe stacktrace draw * Extend metadata usage of recipe builder to recipe itself * Implement metadata handling & NEI comparator for PCB factory * Some rename around NEIRecipeInfo * Some toString implementations * Add more APIs for addons & some rename * Infer handler icon from recipe catalyst if one is not set * Also shrink recipe title when OC is not used * Remove rare earth centrifuge recipe * Use metadata for replicator backend * Adjust geothermal generator output slot * Allow having multiple transferrects * Store recipemap reference in backend * Rename vacuumRecipes -> vacuumFreezerRecipes * Add config to tweak visibility of recipe categories * Remove mHideRecyclingRecipes in favor of recipe category config * Fix typo fluidSolidfierRecipes -> fluidSolidifierRecipes * Refactor findRecipe and ProcessingLogic to use Stream * Fix BBF handler icon & remove bronze blast furnace * Add fluent API for findRecipe * Add way to stop adding progressbar * Change arg order for special texture * Avoid overwriting interesting failure with NO_RECIPE * Some changes for FuelBackend * Set space project icon * Remove localization from TT * Remove CNC recipe adder * Move recipe extractor from AE2FC * Minor internal change for ProcessingLogic#applyRecipe * More javadoc on #getAvailableRecipeMaps * Better implementation of #ofSupplier * Move replicator exponent config to GT_Proxy * Remove RC & IC2 macerator handling * Rename StreamUtil -> GT_StreamUtil * Refactor code around RecipeMetadataStorage * Revise #compileRecipe javadoc * Switch extreme diesel recipe loader to downstream recipe map * Optimize #reMap * Rename reload -> reloadNEICache * Minor tweak for drawEnergyInfo * a bit more doc * Adjust recipe catalysts * Add toString implementation for GT_Fluid for debug * Minor revision for OilCrackerBackend * Index replicator recipes by material --------- Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> --- .../loaders/oreprocessing/ProcessingArrows.java | 12 +- .../loaders/oreprocessing/ProcessingBeans.java | 4 +- .../loaders/oreprocessing/ProcessingBlock.java | 30 ++--- .../loaders/oreprocessing/ProcessingCell.java | 20 ++-- .../loaders/oreprocessing/ProcessingCrafting.java | 106 ++++++++-------- .../loaders/oreprocessing/ProcessingCrate.java | 20 ++-- .../loaders/oreprocessing/ProcessingCrop.java | 36 +++--- .../oreprocessing/ProcessingCrushedOre.java | 18 +-- .../oreprocessing/ProcessingCrystallized.java | 8 +- .../loaders/oreprocessing/ProcessingDirty.java | 20 ++-- .../loaders/oreprocessing/ProcessingDust.java | 92 +++++++------- .../loaders/oreprocessing/ProcessingDye.java | 6 +- .../loaders/oreprocessing/ProcessingFoil.java | 4 +- .../loaders/oreprocessing/ProcessingFood.java | 24 ++-- .../loaders/oreprocessing/ProcessingGear.java | 6 +- .../loaders/oreprocessing/ProcessingGem.java | 98 +++++++-------- .../loaders/oreprocessing/ProcessingIngot.java | 42 ++++--- .../loaders/oreprocessing/ProcessingLens.java | 14 +-- .../loaders/oreprocessing/ProcessingLog.java | 72 +++++------ .../loaders/oreprocessing/ProcessingNugget.java | 15 ++- .../loaders/oreprocessing/ProcessingOre.java | 22 ++-- .../loaders/oreprocessing/ProcessingOrePoor.java | 8 +- .../oreprocessing/ProcessingOreSmelting.java | 33 ++--- .../loaders/oreprocessing/ProcessingPipe.java | 8 +- .../loaders/oreprocessing/ProcessingPlank.java | 30 ++--- .../loaders/oreprocessing/ProcessingPlate.java | 68 +++++------ .../loaders/oreprocessing/ProcessingPure.java | 8 +- .../loaders/oreprocessing/ProcessingRecycling.java | 4 +- .../loaders/oreprocessing/ProcessingRotor.java | 16 +-- .../loaders/oreprocessing/ProcessingRound.java | 4 +- .../loaders/oreprocessing/ProcessingSand.java | 4 +- .../loaders/oreprocessing/ProcessingSaplings.java | 12 +- .../loaders/oreprocessing/ProcessingScrew.java | 4 +- .../loaders/oreprocessing/ProcessingShaping.java | 133 +++++++++++---------- .../loaders/oreprocessing/ProcessingSlab.java | 4 +- .../loaders/oreprocessing/ProcessingStick.java | 20 ++-- .../loaders/oreprocessing/ProcessingStickLong.java | 12 +- .../loaders/oreprocessing/ProcessingStone.java | 76 ++++++------ .../oreprocessing/ProcessingStoneCobble.java | 4 +- .../loaders/oreprocessing/ProcessingToolHead.java | 46 +++---- .../oreprocessing/ProcessingTransforming.java | 24 ++-- .../loaders/oreprocessing/ProcessingWax.java | 2 - .../loaders/oreprocessing/ProcessingWire.java | 68 +++++------ 43 files changed, 617 insertions(+), 640 deletions(-) (limited to 'src/main/java/gregtech/loaders/oreprocessing') diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java index bb32333429..11d1b1e1b8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java @@ -1,6 +1,6 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes; +import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.enchantment.Enchantment; @@ -40,7 +40,7 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .fluidInputs(Materials.HolyWater.getFluid(25L)) .duration(5 * SECONDS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); tOutput = GT_Utility.copyAmount(1, aStack); GT_Utility.updateItemStack(tOutput); @@ -55,7 +55,7 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .fluidInputs(Materials.FierySteel.getFluid(25L)) .duration(5 * SECONDS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); tOutput = GT_Utility.copyAmount(1, aStack); GT_Utility.updateItemStack(tOutput); @@ -70,7 +70,7 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .fluidInputs(Materials.Blaze.getMolten(18L)) .duration(5 * SECONDS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); tOutput = GT_Utility.copyAmount(1, aStack); GT_Utility.updateItemStack(tOutput); @@ -85,7 +85,7 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .fluidInputs(Materials.Rubber.getMolten(18L)) .duration(5 * SECONDS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); tOutput = GT_Utility.copyAmount(1, aStack); GT_Utility.updateItemStack(tOutput); @@ -101,7 +101,7 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .fluidInputs(Materials.Mercury.getFluid(25L)) .duration(5 * SECONDS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); if (!aMaterial.mUnificatable) { return; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java index 9aed3d19af..2fb200216e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java @@ -1,6 +1,6 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; +import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; @@ -30,6 +30,6 @@ public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index e424f1c606..b948f251f0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -1,10 +1,10 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCutterRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidSolidficationRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +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; @@ -49,7 +49,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.min(1000, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 320)))) .duration(2 * ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) @@ -61,7 +61,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.min(750, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 426)))) .duration(2 * ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) @@ -73,7 +73,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.min(250, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 1280)))) .duration(((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); } @@ -89,7 +89,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.min(1000, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 320)))) .duration(2 * ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack)) @@ -101,7 +101,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.min(750, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 426)))) .duration(2 * ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack)) @@ -113,7 +113,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.min(250, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 1280)))) .duration(((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); } } @@ -142,7 +142,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .fluidInputs(aMaterial.getMolten(1296L)) .duration(14 * SECONDS + 8 * TICKS) .eut(8) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); } } } @@ -173,7 +173,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(tStack2) .duration(5 * SECONDS) .eut(24) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); } if (GregTech_API.sRecipeFile.get( @@ -196,7 +196,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) .duration(15 * SECONDS) .eut(calculateRecipeEU(aMaterial, 2)) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); } switch (aMaterial.mName) { @@ -207,7 +207,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1L)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index c99894caab..d681df1b5a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -1,8 +1,8 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes; +import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; +import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; +import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; 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; @@ -51,8 +51,6 @@ public class ProcessingCell implements IOreRecipeRegistrator { } recipeBuilder.metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); } if (!((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0))) { @@ -139,7 +137,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { recipeBuilder.itemOutputs(outputsArray) .duration(Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount))) .eut(Math.min(4, tList.size()) * 30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); } else { long tCellBalance = tCapsuleCount + tItemAmount - 1; GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); @@ -155,7 +153,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { recipeBuilder.itemOutputs(outputsArray) .duration(Math.max(1L, Math.abs(aMaterial.getProtons() * 8L * tItemAmount))) .eut(Math.min(4, tList.size()) * 30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); } } if ((aMaterial.mExtraData & 0x2) != 0) { @@ -174,7 +172,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { recipeBuilder.itemOutputs(outputsArray) .duration(Math.max(1L, Math.abs(aMaterial.getMass() * 2L * tItemAmount))) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); } } } @@ -194,14 +192,10 @@ public class ProcessingCell implements IOreRecipeRegistrator { case "Tin": recipeBuilder.metadata(FUEL_VALUE, 150_000) .metadata(FUEL_TYPE, 4) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); default: recipeBuilder.metadata(FUEL_VALUE, (int) Math.max(1024L, 1024L * aMaterial.getMass())) .metadata(FUEL_TYPE, 4) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); } if (GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null) { @@ -210,7 +204,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L)) .duration(((int) Math.max(aMaterial.getMass() * 2L, 1L)) * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index 5c2f74a9cd..438da254a2 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -3,8 +3,8 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.BuildCraftSilicon; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes; +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; @@ -39,7 +39,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .fluidInputs(Materials.Concrete.getMolten(144L)) .duration(2 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } case "craftingLensBlue" -> { @@ -50,7 +50,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -59,7 +59,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_LapotronCrystal.getWildcard(1L), GT_Utility.copyAmount(0, aStack)) @@ -67,7 +67,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Chip_CrystalCPU.get(1L), GT_Utility.copyAmount(0, aStack)) @@ -75,7 +75,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(30 * SECONDS) .eut(40000) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) @@ -83,7 +83,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) @@ -91,7 +91,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) @@ -99,7 +99,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(2 * MINUTES) .eut(TierEU.RECIPE_UV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); } case "craftingLensYellow" -> { @@ -111,7 +111,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -120,14 +120,14 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_LPIC.get(1)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) @@ -135,7 +135,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) @@ -143,7 +143,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) @@ -151,7 +151,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) @@ -159,7 +159,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(15 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); } case "craftingLensOrange" -> { @@ -168,28 +168,28 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(1)) .duration(15 * SECONDS) .eut(64) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(4)) .duration(15 * SECONDS) .eut(256) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(16)) .duration(15 * SECONDS) .eut(1024) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(64)) .duration(15 * SECONDS) .eut(4096) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); } case "craftingLensCyan" -> { @@ -201,7 +201,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -210,14 +210,14 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(1)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) @@ -225,7 +225,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) @@ -233,7 +233,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) @@ -241,7 +241,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(15 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) @@ -249,7 +249,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_LuV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); } case "craftingLensRed" -> { @@ -261,7 +261,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -270,14 +270,14 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0)) .duration(10 * SECONDS) .eut(16) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ILC.get(1)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) @@ -285,7 +285,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) @@ -293,7 +293,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) @@ -301,7 +301,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) @@ -309,7 +309,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(1 * MINUTES + 15 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); } case "craftingLensGreen" -> { @@ -320,7 +320,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(30 * SECONDS) .eut(10000) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Chip_CrystalSoC.get(1L), GT_Utility.copyAmount(0, aStack)) @@ -328,21 +328,21 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(60 * SECONDS) .eut(80000) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ULPIC.get(2)) .duration(30 * SECONDS) .eut(30) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ULPIC.get(8)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) @@ -350,7 +350,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) @@ -358,7 +358,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(1 * MINUTES + 15 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) @@ -366,7 +366,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(60 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); } case "craftingLensWhite" -> { @@ -377,7 +377,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -386,28 +386,28 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.copyAmount(0, aStack)) .itemOutputs(new ItemStack(Blocks.sandstone, 1, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.stone, 1, 0), GT_Utility.copyAmount(0, aStack)) .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 3)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.quartz_block, 1, 0), GT_Utility.copyAmount(0, aStack)) .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -416,7 +416,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) @@ -424,7 +424,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) @@ -432,7 +432,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) @@ -440,7 +440,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) @@ -448,7 +448,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(15 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) @@ -456,7 +456,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .requiresCleanRoom() .duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_LuV) - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java index 6c20061f19..105b5c8f13 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java @@ -1,7 +1,7 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sUnboxinatorRecipes; +import static gregtech.api.recipe.RecipeMaps.packagerRecipes; +import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; @@ -39,7 +39,7 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L)) .duration(5 * SECONDS) .eut(8) - .addTo(sBoxinatorRecipes); + .addTo(packagerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L)) .itemOutputs( @@ -47,7 +47,7 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L)) .duration(40 * SECONDS) .eut(1) - .addTo(sUnboxinatorRecipes); + .addTo(unpackagerRecipes); } if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), @@ -63,7 +63,7 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L)) .duration(5 * SECONDS) .eut(8) - .addTo(sBoxinatorRecipes); + .addTo(packagerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L)) .itemOutputs( @@ -71,7 +71,7 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L)) .duration(40 * SECONDS) .eut(1) - .addTo(sUnboxinatorRecipes); + .addTo(unpackagerRecipes); } if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), @@ -87,7 +87,7 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L)) .duration(5 * SECONDS) .eut(8) - .addTo(sBoxinatorRecipes); + .addTo(packagerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L)) .itemOutputs( @@ -95,7 +95,7 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L)) .duration(40 * SECONDS) .eut(1) - .addTo(sUnboxinatorRecipes); + .addTo(unpackagerRecipes); } if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), @@ -111,7 +111,7 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L)) .duration(5 * SECONDS) .eut(8) - .addTo(sBoxinatorRecipes); + .addTo(packagerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L)) .itemOutputs( @@ -119,7 +119,7 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L)) .duration(40 * SECONDS) .eut(1) - .addTo(sUnboxinatorRecipes); + .addTo(unpackagerRecipes); } if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index a7e6b1529c..92b5ae9cda 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -1,10 +1,10 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBrewingRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sSlicerRecipes; +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; @@ -34,7 +34,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); Fluid[] waterArray; @@ -54,7 +54,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.tea"), 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } } case "cropGrape" -> { @@ -65,7 +65,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.grapejuice"), 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } } case "cropChilipepper" -> GT_Values.RA.stdBuilder() @@ -73,27 +73,27 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); case "cropCoffee" -> GT_Values.RA.stdBuilder() .itemInputs(aStack) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); case "cropPotato" -> { GT_Values.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(sSlicerRecipes); + .addTo(slicerRecipes); GT_Values.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Stripes.get(0L)) .itemOutputs(ItemList.Food_Raw_Fries.get(1L)) .duration(3 * SECONDS + 4 * TICKS) .eut(4) - .addTo(sSlicerRecipes); + .addTo(slicerRecipes); for (Fluid tFluid : waterArray) { GT_Values.RA.stdBuilder() @@ -102,7 +102,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.potatojuice"), 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } } case "cropLemon" -> { @@ -111,7 +111,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs(ItemList.Food_Sliced_Lemon.get(4L)) .duration(3 * SECONDS + 4 * TICKS) .eut(4) - .addTo(sSlicerRecipes); + .addTo(slicerRecipes); for (Fluid tFluid : waterArray) { GT_Values.RA.stdBuilder() @@ -120,7 +120,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.lemonjuice"), 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } GT_Values.RA.stdBuilder() @@ -129,26 +129,26 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.leninade"), 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } case "cropTomato" -> GT_Values.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(sSlicerRecipes); + .addTo(slicerRecipes); case "cropCucumber" -> GT_Values.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(sSlicerRecipes); + .addTo(slicerRecipes); case "cropOnion" -> GT_Values.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Onion.get(4L)) .duration(3 * SECONDS + 4 * TICKS) .eut(4) - .addTo(sSlicerRecipes); + .addTo(slicerRecipes); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index 2fd74622c4..a730a1849b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -1,9 +1,9 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sSifterRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes; +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; @@ -32,7 +32,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack)) @@ -45,7 +45,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR .outputChances(10000, 1000) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); } case crushedPurified -> { GT_Values.RA.stdBuilder() @@ -63,7 +63,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR .outputChances(10000, 1111) .duration(25 * SECONDS) .eut(48) - .addTo(sThermalCentrifugeRecipes); + .addTo(thermalCentrifugeRecipes); ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L); if (tGem == null) { @@ -84,7 +84,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR .outputChances(300, 1200, 4500, 1400, 2800, 3500) .duration(40 * SECONDS) .eut(16) - .addTo(sSifterRecipes); + .addTo(sifterRecipes); default -> GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs( @@ -97,7 +97,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR .outputChances(100, 400, 1500, 2000, 4000, 5000) .duration(40 * SECONDS) .eut(16) - .addTo(sSifterRecipes); + .addTo(sifterRecipes); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java index cd9e3eb597..ec8fd12a74 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java @@ -1,7 +1,7 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; +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; @@ -36,14 +36,14 @@ public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecip .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index b407cb9c9b..b3aad4e25c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -1,9 +1,9 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes; +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.thermalCentrifugeRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; @@ -33,7 +33,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L)) .duration(10) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack)) @@ -50,7 +50,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .outputChances(10000, 1000) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_ModHandler.addOreWasherRecipe( GT_Utility.copyAmount(1, aStack), @@ -80,7 +80,7 @@ public class ProcessingDirty implements gregtech.api.interfaces