diff options
| author | miozune <miozune@gmail.com> | 2023-12-04 05:34:27 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-03 21:34:27 +0100 |
| commit | f74c7cc297d1d19d38a19683cd277ad9ce605d3a (patch) | |
| tree | b2a5d66ec5a959099240fb1db239ffc0f9531839 /src/main/java/gregtech/loaders/postload | |
| parent | b08cde7de4ec93cba05fb070991ad1dffb800ce1 (diff) | |
| download | GT5-Unofficial-f74c7cc297d1d19d38a19683cd277ad9ce605d3a.tar.gz GT5-Unofficial-f74c7cc297d1d19d38a19683cd277ad9ce605d3a.tar.bz2 GT5-Unofficial-f74c7cc297d1d19d38a19683cd277ad9ce605d3a.zip | |
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>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
52 files changed, 2467 insertions, 2406 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java b/src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java deleted file mode 100644 index 8ff392e817..0000000000 --- a/src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java +++ /dev/null @@ -1,22 +0,0 @@ -package gregtech.loaders.postload; - -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Recipe; - -public class GT_ExtremeDieselFuelLoader implements Runnable { - - @Override - public void run() { - GT_Log.out.println("GT_Mod: Adding extreme diesel fuel."); - int added = 0; - for (GT_Recipe aRecipe : GT_Recipe.GT_Recipe_Map.sDieselFuels.mRecipeList) { - if (aRecipe.mSpecialValue < 1500) { - continue; - } - - added += 1; - GT_Recipe.GT_Recipe_Map.sExtremeDieselFuels.add(aRecipe); - } - GT_Log.out.println("GT_Mod: Added " + added + " kind(s) of extreme diesel fuel."); - } -} diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index 5bf025cf20..5ec4391d71 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -1,12 +1,11 @@ package gregtech.loaders.postload; -import static gregtech.api.enums.GT_Values.VP; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.Thaumcraft; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import java.lang.reflect.InvocationTargetException; @@ -38,13 +37,15 @@ 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.RecipeMaps; import gregtech.api.util.GT_CLS_Compat; import gregtech.api.util.GT_Forestry_Compat; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; 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.common.items.GT_MetaGenerated_Tool_01; @@ -95,20 +96,12 @@ public class GT_PostLoad { .findAny() .ifPresent(e -> aCompressorRecipeList.remove(e.getKey())); // Add default IC2 recipe to GT + GT_ModHandler.addIC2RecipesToGT(aMaceratorRecipeList, RecipeMaps.maceratorRecipes, true, true, true); + GT_ModHandler.addIC2RecipesToGT(aCompressorRecipeList, RecipeMaps.compressorRecipes, true, true, true); + GT_ModHandler.addIC2RecipesToGT(aExtractorRecipeList, RecipeMaps.extractorRecipes, true, true, true); + GT_ModHandler.addIC2RecipesToGT(aOreWashingRecipeList, RecipeMaps.oreWasherRecipes, false, true, true); GT_ModHandler - .addIC2RecipesToGT(aMaceratorRecipeList, GT_Recipe.GT_Recipe_Map.sMaceratorRecipes, true, true, true); - GT_ModHandler - .addIC2RecipesToGT(aCompressorRecipeList, GT_Recipe.GT_Recipe_Map.sCompressorRecipes, true, true, true); - GT_ModHandler - .addIC2RecipesToGT(aExtractorRecipeList, GT_Recipe.GT_Recipe_Map.sExtractorRecipes, true, true, true); - GT_ModHandler - .addIC2RecipesToGT(aOreWashingRecipeList, GT_Recipe.GT_Recipe_Map.sOreWasherRecipes, false, true, true); - GT_ModHandler.addIC2RecipesToGT( - aThermalCentrifugeRecipeList, - GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes, - true, - true, - true); + .addIC2RecipesToGT(aThermalCentrifugeRecipeList, RecipeMaps.thermalCentrifugeRecipes, true, true, true); // noinspection UnstableApiUsage// Stable enough for this project GT_Mod.GT_FML_LOGGER.info("IC2 Removal (" + stopwatch.stop() + "). Have a Cake."); } @@ -125,7 +118,7 @@ public class GT_PostLoad { .fluidInputs(tData.fluid) .duration((tData.fluid.amount / 62) * TICKS) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); GT_RecipeBuilder builder = GT_Values.RA.stdBuilder() .itemInputs(tData.filledContainer); if (tData.emptyContainer.stackSize > 0) { @@ -134,7 +127,7 @@ public class GT_PostLoad { builder.fluidOutputs(tData.fluid) .duration((tData.fluid.amount / 62) * TICKS) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); } } @@ -146,7 +139,7 @@ public class GT_PostLoad { } if (ItemList.IC2_Crop_Seeds.get(1L) != null) { - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + RecipeMaps.scannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { ItemList.IC2_Crop_Seeds.getWildcard(1L) }, new ItemStack[] { ItemList.IC2_Crop_Seeds.getWithName(1L, "Scanned Seeds") }, @@ -157,7 +150,7 @@ public class GT_PostLoad { 8, 0); } - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + RecipeMaps.scannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { new ItemStack(Items.written_book, 1, 32767) }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Book Data") }, @@ -167,7 +160,7 @@ public class GT_PostLoad { 128, 30, 0); - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + RecipeMaps.scannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { new ItemStack(Items.filled_map, 1, 32767) }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Map Data") }, @@ -177,7 +170,7 @@ public class GT_PostLoad { 128, 30, 0); - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + RecipeMaps.scannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { ItemList.Tool_DataOrb.getWithName(1L, "Orb to overwrite") }, new ItemStack[] { ItemList.Tool_DataOrb.getWithName(1L, "Copy of the Orb") }, @@ -187,7 +180,7 @@ public class GT_PostLoad { 512, 30, 0); - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + RecipeMaps.scannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Stick to overwrite") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Copy of the Stick") }, @@ -197,7 +190,7 @@ public class GT_PostLoad { 128, 30, 0); - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + RecipeMaps.scannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Raw Prospection Data") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Analyzed Prospection Data") }, @@ -208,7 +201,7 @@ public class GT_PostLoad { 30, 0); if (GalacticraftCore.isModLoaded()) { - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + RecipeMaps.scannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { Objects .requireNonNull(GT_ModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1, Short.MAX_VALUE)) @@ -220,7 +213,7 @@ public class GT_PostLoad { 36000, 480, 0); - if (GalacticraftMars.isModLoaded()) GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + if (GalacticraftMars.isModLoaded()) RecipeMaps.scannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { Objects .requireNonNull(GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1, Short.MAX_VALUE)) @@ -234,7 +227,7 @@ public class GT_PostLoad { 0); if (GalaxySpace.isModLoaded()) { for (int i = 4; i < 9; i++) { - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + RecipeMaps.scannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { GT_ModHandler.getModItem(GalaxySpace.ID, "item.SchematicTier" + i, 1) .setStackDisplayName("Any Schematic") }, @@ -254,73 +247,66 @@ public class GT_PostLoad { if ((tMaterial.mElement != null) && (!tMaterial.mElement.mIsIsotope) && (tMaterial != Materials.Magic) && (tMaterial.getMass() > 0L)) { - ItemStack tOutput = ItemList.Tool_DataOrb.get(1L); - Behaviour_DataOrb.setDataTitle(tOutput, "Elemental-Scan"); - Behaviour_DataOrb.setDataName(tOutput, tMaterial.mElement.name()); - ItemStack tInput = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L); - ItemStack[] iSMat0 = new ItemStack[] { tInput }; - ItemStack[] iSMat1 = new ItemStack[] { tOutput }; - if (tInput != null) { - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( - false, - iSMat0, - iSMat1, - ItemList.Tool_DataOrb.get(1L), - null, - null, - (int) (tMaterial.getMass() * 8192L), - 30, - 0); - GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe( - false, - null, - iSMat0, - iSMat1, - new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, - null, - (int) (tMaterial.getMass() * 512L), - (int) VP[1], - 0); + ItemStack dataOrb = ItemList.Tool_DataOrb.get(1L); + Behaviour_DataOrb.setDataTitle(dataOrb, "Elemental-Scan"); + Behaviour_DataOrb.setDataName(dataOrb, tMaterial.mElement.name()); + ItemStack dustItem = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L); + if (dustItem != null) { + GT_Values.RA.stdBuilder() + .itemInputs(dustItem) + .itemOutputs(dataOrb) + .special(ItemList.Tool_DataOrb.get(1L)) + .duration((int) (tMaterial.getMass() * 8192L)) + .eut(TierEU.RECIPE_LV) + .fake() + .ignoreCollision() + .addTo(RecipeMaps.scannerFakeRecipes); + GT_Values.RA.stdBuilder() + .itemOutputs(dustItem) + .special(dataOrb) + .metadata(GT_RecipeConstants.MATERIAL, tMaterial) + .addTo(RecipeMaps.replicatorRecipes); return; } - tInput = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L); - iSMat0 = new ItemStack[] { tInput }; - if (tInput != null) { - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( - false, - iSMat0, - iSMat1, - ItemList.Tool_DataOrb.get(1L), - null, - null, - (int) (tMaterial.getMass() * 8192L), - 30, - 0); - GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe( - false, - null, - iSMat0, - iSMat1, - new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, - null, - (int) (tMaterial.getMass() * 512L), - (int) VP[1], - 0); + ItemStack cellItem = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L); + if (cellItem != null) { + GT_Values.RA.stdBuilder() + .itemInputs(cellItem) + .itemOutputs(dataOrb) + .special(ItemList.Tool_DataOrb.get(1L)) + .duration((int) (tMaterial.getMass() * 8192L)) + .eut(TierEU.RECIPE_LV) + .fake() + .ignoreCollision() + .addTo(RecipeMaps.scannerFakeRecipes); + FluidStack fluidStack = GT_Utility.getFluidForFilledItem(cellItem, false); + GT_RecipeBuilder builder = GT_Values.RA.stdBuilder(); + if (fluidStack != null) { + builder.fluidOutputs(fluidStack); + } else { + builder.itemInputs(Materials.Empty.getCells(1)) + .itemOutputs(cellItem); + } + builder.special(dataOrb) + .metadata(GT_RecipeConstants.MATERIAL, tMaterial) + .addTo(RecipeMaps.replicatorRecipes); } } }); - if (!GT_MetaTileEntity_Massfabricator.sRequiresUUA) GT_Recipe.GT_Recipe_Map.sMassFabFakeRecipes.addFakeRecipe( - false, - null, - null, - null, - null, - new FluidStack[] { Materials.UUMatter.getFluid(1L) }, - GT_MetaTileEntity_Massfabricator.sDurationMultiplier, - 256, - 0); - GT_Recipe.GT_Recipe_Map.sMassFabFakeRecipes.addFakeRecipe( + if (!GT_MetaTileEntity_Massfabricator.sRequiresUUA) { + GT_MetaTileEntity_Massfabricator.nonUUARecipe = RecipeMaps.massFabFakeRecipes.addFakeRecipe( + false, + null, + null, + null, + null, + new FluidStack[] { Materials.UUMatter.getFluid(1L) }, + GT_MetaTileEntity_Massfabricator.sDurationMultiplier, + GT_MetaTileEntity_Massfabricator.BASE_EUT, + 0); + } + GT_MetaTileEntity_Massfabricator.uuaRecipe = RecipeMaps.massFabFakeRecipes.addFakeRecipe( false, new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, null, @@ -328,9 +314,9 @@ public class GT_PostLoad { new FluidStack[] { Materials.UUAmplifier.getFluid(GT_MetaTileEntity_Massfabricator.sUUAperUUM) }, new FluidStack[] { Materials.UUMatter.getFluid(1L) }, GT_MetaTileEntity_Massfabricator.sDurationMultiplier / GT_MetaTileEntity_Massfabricator.sUUASpeedBonus, - 256, + GT_MetaTileEntity_Massfabricator.BASE_EUT, 0); - GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes.addFakeRecipe( + RecipeMaps.rockBreakerFakeRecipes.addFakeRecipe( false, new ItemStack[] { ItemList.Display_ITS_FREE.getWithName(1L, "IT'S FREE! Place Lava on Side") }, new ItemStack[] { new ItemStack(Blocks.cobblestone, 1) }, @@ -340,7 +326,7 @@ public class GT_PostLoad { 16, 30, 0); - GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes.addFakeRecipe( + RecipeMaps.rockBreakerFakeRecipes.addFakeRecipe( false, new ItemStack[] { ItemList.Display_ITS_FREE.getWithName(1L, "IT'S FREE! Place Lava on Top") }, new ItemStack[] { new ItemStack(Blocks.stone, 1) }, @@ -350,7 +336,7 @@ public class GT_PostLoad { 16, 30, 0); - GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes.addFakeRecipe( + RecipeMaps.rockBreakerFakeRecipes.addFakeRecipe( false, new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), GT_Utility.getIntegratedCircuit(1) }, @@ -491,32 +477,33 @@ public class GT_PostLoad { } public static void addSolidFakeLargeBoilerFuels() { - GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels.addSolidRecipes( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 1), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), - GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Coal, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lignite, 1), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), - GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Lignite, 1), - GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.slab, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), - GT_OreDictUnificator.get(ItemList.Block_SSFUEL.get(1)), - GT_OreDictUnificator.get(ItemList.Block_MSSFUEL.get(1)), - GT_OreDictUnificator.get(OrePrefixes.rod, Materials.Blaze, 1)); + RecipeMaps.largeBoilerFakeFuels.getBackend() + .addSolidRecipes( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 1), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), + GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Coal, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lignite, 1), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), + GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Lignite, 1), + GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.slab, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), + GT_OreDictUnificator.get(ItemList.Block_SSFUEL.get(1)), + GT_OreDictUnificator.get(ItemList.Block_MSSFUEL.get(1)), + GT_OreDictUnificator.get(OrePrefixes.rod, Materials.Blaze, 1)); if (Thaumcraft.isModLoaded()) { - GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels + RecipeMaps.largeBoilerFakeFuels.getBackend() .addSolidRecipe(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1)); } } diff --git a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java index 32023df99a..0ff53d0424 100644 --- a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java @@ -1,171 +1,167 @@ package gregtech.loaders.postload; import gregtech.api.enums.SoundResource; +import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GT_ProcessingArray_Manager; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; public class GT_ProcessingArrayRecipeLoader { public static void registerDefaultGregtechMaps() { // Alloy Smelter - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.alloysmelter", GT_Recipe_Map.sAlloySmelterRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.alloysmelter", RecipeMaps.alloySmelterRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.alloysmelter", SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Arc Furnace - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.arcfurnace", GT_Recipe_Map.sArcFurnaceRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.arcfurnace", RecipeMaps.arcFurnaceRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.arcfurnace", SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Assembler - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.assembler", GT_Recipe_Map.sAssemblerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.assembler", RecipeMaps.assemblerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.assembler", SoundResource.NONE); // Autoclave - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.autoclave", GT_Recipe_Map.sAutoclaveRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.autoclave", RecipeMaps.autoclaveRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.autoclave", SoundResource.NONE); // Bender - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.bender", GT_Recipe_Map.sBenderRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.bender", RecipeMaps.benderRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.bender", SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Boxinator - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.boxinator", GT_Recipe_Map.sBoxinatorRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.boxinator", RecipeMaps.packagerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.boxinator", SoundResource.NONE); // Brewery - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.brewery", GT_Recipe_Map.sBrewingRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.brewery", RecipeMaps.brewingRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.brewery", SoundResource.NONE); // Canner - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.canner", GT_Recipe_Map.sCannerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.canner", RecipeMaps.cannerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.canner", SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Centrifuge - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.centrifuge", GT_Recipe_Map.sMultiblockCentrifugeRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.centrifuge", RecipeMaps.centrifugeNonCellRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.centrifuge", SoundResource.NONE); // Chemical Bath - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.chemicalbath", GT_Recipe_Map.sChemicalBathRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.chemicalbath", RecipeMaps.chemicalBathRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.chemicalbath", SoundResource.NONE); // Chemical Reactor GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.chemicalreactor", GT_Recipe_Map.sMultiblockChemicalRecipes); + .addRecipeMapToPA("basicmachine.chemicalreactor", RecipeMaps.multiblockChemicalReactorRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.chemicalreactor", SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Circuit Assembler GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.circuitassembler", GT_Recipe_Map.sCircuitAssemblerRecipes); + .addRecipeMapToPA("basicmachine.circuitassembler", RecipeMaps.circuitAssemblerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.circuitassembler", SoundResource.NONE); // Compressor - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.compressor", GT_Recipe_Map.sCompressorRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.compressor", RecipeMaps.compressorRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.compressor", SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Cutting Machine - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.cutter", GT_Recipe_Map.sCutterRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.cutter", RecipeMaps.cutterRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.cutter", SoundResource.NONE); // Distillery - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.distillery", GT_Recipe_Map.sDistilleryRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.distillery", RecipeMaps.distilleryRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.distillery", SoundResource.GT_MACHINES_DISTILLERY_LOOP); // Electrolyzer - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.electrolyzer", GT_Recipe_Map.sMultiblockElectrolyzerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.electrolyzer", RecipeMaps.electrolyzerNonCellRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.electrolyzer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Extractor - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extractor", GT_Recipe_Map.sExtractorRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extractor", RecipeMaps.extractorRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.extractor", SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Extruder - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extruder", GT_Recipe_Map.sExtruderRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extruder", RecipeMaps.extruderRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.extruder", SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Fermenter - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fermenter", GT_Recipe_Map.sFermentingRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fermenter", RecipeMaps.fermentingRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fermenter", SoundResource.NONE); // Fluid Canner - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidcanner", GT_Recipe_Map.sFluidCannerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidcanner", RecipeMaps.fluidCannerRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.fluidcanner", SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Fluid Extractor - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.fluidextractor", GT_Recipe_Map.sFluidExtractionRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidextractor", RecipeMaps.fluidExtractionRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.fluidextractor", SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Fluid Heater - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidheater", GT_Recipe_Map.sFluidHeaterRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidheater", RecipeMaps.fluidHeaterRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fluidheater", SoundResource.NONE); // Fluid Solidifier - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.fluidsolidifier", GT_Recipe_Map.sFluidSolidficationRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidsolidifier", RecipeMaps.fluidSolidifierRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fluidsolidifier", SoundResource.NONE); // Forge Hammer - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.hammer", GT_Recipe_Map.sHammerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.hammer", RecipeMaps.hammerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.hammer", SoundResource.RANDOM_ANVIL_USE); // Forming Press - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.press", GT_Recipe_Map.sPressRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.press", RecipeMaps.formingPressRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.press", SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Laser Engraver - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.laserengraver", GT_Recipe_Map.sLaserEngraverRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.laserengraver", RecipeMaps.laserEngraverRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.laserengraver", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Lathe - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.lathe", GT_Recipe_Map.sLatheRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.lathe", RecipeMaps.latheRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.lathe", SoundResource.NONE); // Macerator - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.macerator", GT_Recipe_Map.sMaceratorRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.macerator", RecipeMaps.maceratorRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.macerator", SoundResource.IC2_MACHINES_MACERATOR_OP); // Magnetic Separator GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.electromagneticseparator", GT_Recipe_Map.sElectroMagneticSeparatorRecipes); + .addRecipeMapToPA("basicmachine.electromagneticseparator", RecipeMaps.electroMagneticSeparatorRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.electromagneticseparator", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Matter Amplifier - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.amplifab", GT_Recipe_Map.sAmplifiers); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.amplifab", RecipeMaps.amplifierRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.amplifab", SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Microwave - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.microwave", GT_Recipe_Map.sMicrowaveRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.microwave", RecipeMaps.microwaveRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.microwave", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP); // Mixer - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.mixer", GT_Recipe_Map.sMultiblockMixerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.mixer", RecipeMaps.mixerNonCellRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.mixer", SoundResource.NONE); // Ore Washer - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.orewasher", GT_Recipe_Map.sOreWasherRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.orewasher", RecipeMaps.oreWasherRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.orewasher", SoundResource.NONE); // Plasma Arc Furnace GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.plasmaarcfurnace", GT_Recipe_Map.sPlasmaArcFurnaceRecipes); + .addRecipeMapToPA("basicmachine.plasmaarcfurnace", RecipeMaps.plasmaArcFurnaceRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.plasmaarcfurnace", SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Polarizer - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.polarizer", GT_Recipe_Map.sPolarizerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.polarizer", RecipeMaps.polarizerRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.polarizer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Printer - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.printer", GT_Recipe_Map.sPrinterRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.printer", RecipeMaps.printerRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.printer", SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Recycler - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.recycler", GT_Recipe_Map.sRecyclerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.recycler", RecipeMaps.recyclerRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.recycler", SoundResource.IC2_MACHINES_RECYCLER_OP); // Scanner - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.scanner", GT_Recipe_Map.sScannerFakeRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.scanner", RecipeMaps.scannerFakeRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.scanner", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Sifter - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.sifter", GT_Recipe_Map.sSifterRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.sifter", RecipeMaps.sifterRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.sifter", SoundResource.NONE); // Slicer - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.slicer", GT_Recipe_Map.sSlicerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.slicer", RecipeMaps.slicerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.slicer", SoundResource.NONE); // Thermal Centrifuge GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.thermalcentrifuge", GT_Recipe_Map.sThermalCentrifugeRecipes); + .addRecipeMapToPA("basicmachine.thermalcentrifuge", RecipeMaps.thermalCentrifugeRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.thermalcentrifuge", SoundResource.NONE); // Unboxinator - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.unboxinator", GT_Recipe_Map.sUnboxinatorRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.unboxinator", RecipeMaps.unpackagerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.unboxinator", SoundResource.NONE); // Wiremill - GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.wiremill", GT_Recipe_Map.sWiremillRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.wiremill", RecipeMaps.wiremillRecipes); GT_ProcessingArray_Manager .addSoundResourceToPA("basicmachine.wiremill", SoundResource.IC2_MACHINES_RECYCLER_OP); } diff --git a/src/main/java/gregtech/loaders/postload/GT_UUMRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_UUMRecipeLoader.java deleted file mode 100644 index bf2c2c4ebb..0000000000 --- a/src/main/java/gregtech/loaders/postload/GT_UUMRecipeLoader.java +++ /dev/null @@ -1,7 +0,0 @@ -package gregtech.loaders.postload; - -public class GT_UUMRecipeLoader implements Runnable { - - @Override - public void run() {} -} diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java index d5d1537a49..aaf25812e4 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java @@ -1,10 +1,10 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCrackingRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes; +import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; +import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; +import static gregtech.api.recipe.RecipeMaps.crackingRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; +import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -34,7 +34,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.BauxiteSlurry.getFluid(8000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -46,7 +46,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.BauxiteSlurry.getFluid(8000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -54,7 +54,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(32000)) .duration(8 * SECONDS) .eut(400) - .addTo(sCrackingRecipes); + .addTo(crackingRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Aluminiumhydroxide.getDust(1)) @@ -68,7 +68,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(5000)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(MaterialsOreAlum.BauxiteSlag.getDust(1)) @@ -81,7 +81,7 @@ public class GT_BauxiteRefineChain { .outputChances(10000, 3000, 2000, 9000, 8000) .duration(2 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Ilmenite, 1)) @@ -91,7 +91,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(new FluidStack(ItemList.sGreenVitriol, 2000)) .duration(21 * SECONDS) .eut(1000) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Ilmenite, 1)) @@ -101,7 +101,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(new FluidStack(ItemList.sGreenVitriol, 2000)) .duration(21 * SECONDS) .eut(1000) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(MaterialsOreAlum.IlmeniteSlag.getDust(1)) @@ -114,7 +114,7 @@ public class GT_BauxiteRefineChain { .outputChances(8000, 500, 2000, 5000, 6000) .duration(2 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); OrePrefixes[] washable = new OrePrefixes[] { OrePrefixes.crushed, OrePrefixes.crushedPurified, OrePrefixes.dustImpure, OrePrefixes.dustPure }; @@ -129,7 +129,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.SapphireJuice.getFluid(1000)) .duration(2 * SECONDS) .eut(100) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -140,7 +140,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.GreenSapphireJuice.getFluid(1000)) .duration(2 * SECONDS) .eut(100) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -151,7 +151,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.RubyJuice.getFluid(1000)) .duration(2 * SECONDS) .eut(100) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); } GT_Values.RA.stdBuilder() @@ -166,7 +166,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) .duration(2 * SECONDS + 5 * TICKS) .eut(100) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -181,7 +181,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) .duration(2 * SECONDS + 5 * TICKS) .eut(100) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -196,7 +196,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) .duration(2 * SECONDS + 5 * TICKS) .eut(100) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Pyrope.getDust(1)) @@ -212,7 +212,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) .duration(2 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Almandine.getDust(1)) @@ -228,7 +228,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) .duration(2 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Spessartine.getDust(1)) @@ -244,7 +244,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) .duration(2 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Andradite.getDust(1)) @@ -260,7 +260,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) .duration(2 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Uvarovite.getDust(1)) @@ -276,7 +276,7 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) .duration(2 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Grossular.getDust(1)) @@ -292,6 +292,6 @@ public class GT_BauxiteRefineChain { .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) .duration(2 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index a72fe0acc9..dabcd93a8d 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -23,8 +23,8 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; +import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_RecipeBuilder; public class GT_NaniteChain { @@ -234,7 +234,7 @@ public class GT_NaniteChain { .duration(750 * GT_RecipeBuilder.SECONDS) .eut(TierEU.RECIPE_MAX) .specialValue(3) - .addTo(GT_Recipe.GT_Recipe_Map.sNanoForge); + .addTo(RecipeMaps.nanoForgeRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 7e7e4ec496..392e6fa154 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -2,7 +2,8 @@ package gregtech.loaders.postload.chains; import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.metadata.PCBFactoryUpgrade.BIO; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; @@ -23,6 +24,9 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; +import gregtech.api.recipe.RecipeMaps; +import gregtech.api.recipe.metadata.PCBFactoryTierKey; +import gregtech.api.recipe.metadata.PCBFactoryUpgradeKey; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_PCBFactoryManager; @@ -31,12 +35,10 @@ import gregtech.api.util.GT_Utility; @SuppressWarnings("SpellCheckingInspection") public class GT_PCBFactoryRecipes { - public static void load() { - final int mBioUpgradeBitMap = 0b1000; - final int mTier3BitMap = 0b100; - final int mTier2BitMap = 0b10; - final int mTier1BitMap = 0b1; + private static final PCBFactoryTierKey TIER = PCBFactoryTierKey.INSTANCE; + private static final PCBFactoryUpgradeKey UPGRADE = PCBFactoryUpgradeKey.INSTANCE; + public static void load() { final Fluid solderLuV = FluidRegistry.getFluid("molten.indalloy140") != null ? FluidRegistry.getFluid("molten.indalloy140") : FluidRegistry.getFluid("molten.solderingalloy"); @@ -65,7 +67,7 @@ public class GT_PCBFactoryRecipes { .itemOutputs(ItemList.BasicPhotolithographicFrameworkCasing.get(1)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), @@ -73,7 +75,7 @@ public class GT_PCBFactoryRecipes { .itemOutputs(ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UHV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1), @@ -82,7 +84,7 @@ public class GT_PCBFactoryRecipes { .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UIV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), @@ -92,7 +94,7 @@ public class GT_PCBFactoryRecipes { .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8 * 144)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_UMV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // Load CircuitBoard Recipes @@ -106,19 +108,22 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))), - Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 1.5))), - (int) GT_Values.VP[tier] * 3 / 4, - mTier1BitMap | mTier2BitMap | mTier3BitMap); + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))), + Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 1.5)))) + .eut((int) GT_Values.VP[tier] * 3 / 4) + .metadata(TIER, 1) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 0.5)))); @@ -128,19 +133,23 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_Utility.getNaniteAsCatalyst(Materials.Silver), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))), - Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 1.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier2BitMap | mTier3BitMap); + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))), + Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 1.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 2) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier)))); @@ -150,19 +159,23 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(3), + GT_Utility.getNaniteAsCatalyst(Materials.Gold), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))), - Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 1.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier3BitMap); + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))), + Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 1.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 3) + .addTo(RecipeMaps.pcbFactoryRecipes); } // Advanced Circuit Board @@ -174,19 +187,21 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))), - Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 2.5))), - (int) GT_Values.VP[tier] * 3 / 4, - mTier1BitMap | mTier2BitMap | mTier3BitMap); + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))), + Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 2.5)))) + .eut((int) GT_Values.VP[tier] * 3 / 4) + .metadata(TIER, 1) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1.5)))); @@ -196,19 +211,22 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_Utility.getNaniteAsCatalyst(Materials.Silver), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))), - Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 2.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier2BitMap | mTier3BitMap); + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))), + Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 2.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 2) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1)))); @@ -218,19 +236,22 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(3), + GT_Utility.getNaniteAsCatalyst(Materials.Gold), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))), - Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 2.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier3BitMap); + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))), + Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 2.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 3) + .addTo(RecipeMaps.pcbFactoryRecipes); } // More Advanced Circuit Board @@ -242,20 +263,23 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))), GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))), - Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 3.5))), - (int) GT_Values.VP[tier] * 3 / 4, - mTier1BitMap | mTier2BitMap | mTier3BitMap); + .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))), + Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 3.5)))) + .eut((int) GT_Values.VP[tier] * 3 / 4) + .metadata(TIER, 1) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2.5)))); @@ -265,20 +289,24 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_Utility.getNaniteAsCatalyst(Materials.Silver), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))), GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))), - Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 3.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier2BitMap | mTier3BitMap); + .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))), + Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 3.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 2) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2)))); @@ -288,20 +316,24 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(3), + GT_Utility.getNaniteAsCatalyst(Materials.Gold), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))), GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))), - Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 3.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier3BitMap); + .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))), + Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 3.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 3) + .addTo(RecipeMaps.pcbFactoryRecipes); } // Elite Circuit Board @@ -313,20 +345,22 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))), - Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 4.5))), - (int) GT_Values.VP[tier] * 3 / 4, - mTier1BitMap | mTier2BitMap | mTier3BitMap); + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))), + Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 4.5)))) + .eut((int) GT_Values.VP[tier] * 3 / 4) + .metadata(TIER, 1) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3.5)))); @@ -336,20 +370,23 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_Utility.getNaniteAsCatalyst(Materials.Silver), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))), - Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 4.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier2BitMap | mTier3BitMap); + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))), + Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 4.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 2) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3)))); @@ -359,20 +396,23 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(3), + GT_Utility.getNaniteAsCatalyst(Materials.Gold), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))), - Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 4.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier3BitMap); + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))), + Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 4.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 3) + .addTo(RecipeMaps.pcbFactoryRecipes); } // Wetware Circuit Board @@ -384,21 +424,25 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.EnrichedHolmium, (long) (16 * (Math.sqrt(tier - 4)))), GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))), + .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))), Materials.IronIIIChloride.getFluid((long) (5000 * (Math.sqrt(tier - 4)))), - Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))), - (int) GT_Values.VP[tier] * 3 / 4, - mTier1BitMap | mTier2BitMap | mTier3BitMap | mBioUpgradeBitMap); + Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) + .eut((int) GT_Values.VP[tier] * 3 / 4) + .metadata(TIER, 1) + .metadata(UPGRADE, BIO) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4.5)))); @@ -408,21 +452,26 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_Utility.getNaniteAsCatalyst(Materials.Silver), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.EnrichedHolmium, (long) (16 * (Math.sqrt(tier - 4)))), GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))), + .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))), Materials.IronIIIChloride.getFluid((long) (5000 * (Math.sqrt(tier - 4)))), - Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 5.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier2BitMap | mTier3BitMap | mBioUpgradeBitMap); + Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 2) + .metadata(UPGRADE, BIO) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4)))); @@ -432,21 +481,26 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(3), + GT_Utility.getNaniteAsCatalyst(Materials.Gold), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.EnrichedHolmium, (long) (16 * (Math.sqrt(tier - 4)))), GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))), + .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))), Materials.IronIIIChloride.getFluid((long) (5000 * (Math.sqrt(tier - 4)))), - Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 5.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier3BitMap | mBioUpgradeBitMap); + Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 3) + .metadata(UPGRADE, BIO) + .addTo(RecipeMaps.pcbFactoryRecipes); } // Bioware Circuit Board @@ -458,8 +512,9 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator.get( @@ -467,14 +522,17 @@ public class GT_PCBFactoryRecipes { Materials.Longasssuperconductornameforuvwire, (long) (16 * (Math.sqrt(tier - 5)))), GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))), + .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))), Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))), - Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))), - (int) GT_Values.VP[tier] * 3 / 4, - mTier1BitMap | mTier2BitMap | mTier3BitMap | mBioUpgradeBitMap); + Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) + .eut((int) GT_Values.VP[tier] * 3 / 4) + .metadata(TIER, 1) + .metadata(UPGRADE, BIO) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5.5)))); @@ -484,8 +542,10 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_Utility.getNaniteAsCatalyst(Materials.Silver), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator.get( @@ -493,14 +553,17 @@ public class GT_PCBFactoryRecipes { Materials.Longasssuperconductornameforuvwire, (long) (16 * (Math.sqrt(tier - 5)))), GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))), + .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))), Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))), - Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier2BitMap | mTier3BitMap | mBioUpgradeBitMap); + Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 2) + .metadata(UPGRADE, BIO) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5)))); @@ -510,8 +573,10 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(3), + GT_Utility.getNaniteAsCatalyst(Materials.Gold), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_OreDictUnificator.get( @@ -519,14 +584,17 @@ public class GT_PCBFactoryRecipes { Materials.Longasssuperconductornameforuvwire, (long) (16 * (Math.sqrt(tier - 5)))), GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))), + .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))), Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))), - Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier3BitMap | mBioUpgradeBitMap); + Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 3) + .metadata(UPGRADE, BIO) + .addTo(RecipeMaps.pcbFactoryRecipes); } if (GTPlusPlus.isModLoaded()) { @@ -539,8 +607,9 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_ModHandler.getModItem( @@ -551,14 +620,16 @@ public class GT_PCBFactoryRecipes { GT_OreDictUnificator .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), GT_ModHandler - .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), + .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))), - (int) GT_Values.VP[tier] * 3 / 4, - mTier1BitMap | mTier2BitMap | mTier3BitMap); + Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) + .eut((int) GT_Values.VP[tier] * 3 / 4) + .metadata(TIER, 1) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5)))); @@ -568,8 +639,9 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(2), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), @@ -581,14 +653,16 @@ public class GT_PCBFactoryRecipes { GT_OreDictUnificator .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), GT_ModHandler - .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), + .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier2BitMap | mTier3BitMap); + Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 2) + .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); @@ -598,8 +672,9 @@ public class GT_PCBFactoryRecipes { amountOfBoards -= 64; } aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); - GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(3), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), @@ -611,14 +686,16 @@ public class GT_PCBFactoryRecipes { GT_OreDictUnificator .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), GT_ModHandler - .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), + .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))) }, - aBoards.toArray(new ItemStack[0]), - (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5))), - (int) GT_Values.VP[tier + 1] * 3 / 4, - mTier3BitMap); + Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 3) + .addTo(RecipeMaps.pcbFactoryRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java index 76524541e3..a9e587a145 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes; +import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; @@ -73,14 +73,14 @@ public class AlloySmelterRecipes implements Runnable { .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) .eut(16) - .addTo(sAlloySmelterRecipes); + .addTo(alloySmelterRecipes); if (ingot2 != null) { GT_Values.RA.stdBuilder() .itemInputs(ingot1, ingot2) .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) .eut(16) - .addTo(sAlloySmelterRecipes); + .addTo(alloySmelterRecipes); } } @@ -90,7 +90,7 @@ public class AlloySmelterRecipes implements Runnable { .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) .eut(16) - .addTo(sAlloySmelterRecipes); + .addTo(alloySmelterRecipes); } GT_Values.RA.stdBuilder() @@ -98,7 +98,7 @@ public class AlloySmelterRecipes implements Runnable { .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) .eut(16) - .addTo(sAlloySmelterRecipes); + .addTo(alloySmelterRecipes); } } @@ -111,6 +111,6 @@ public class AlloySmelterRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L)) .duration(10 * SECONDS) .eut(8) - .addTo(sAlloySmelterRecipes); + .addTo(alloySmelterRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java index c2309d3cb5..a6c85b7afd 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java @@ -4,6 +4,7 @@ import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GT_RecipeConstants.RECYCLE; import static gregtech.api.util.GT_RecipeConstants.UniversalArcFurnace; import gregtech.api.enums.GT_Values; @@ -25,6 +26,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1)) .duration(8 * SECONDS) .eut(96) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -32,6 +34,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L)) .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -41,6 +44,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L)) .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -48,6 +52,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L)) .duration(10 * TICKS) .eut((int) TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -57,6 +62,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L)) .duration(10 * TICKS) .eut((int) TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -67,6 +73,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -77,6 +84,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -87,6 +95,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -97,6 +106,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -107,6 +117,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -117,6 +128,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -127,6 +139,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -137,6 +150,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -147,6 +161,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -157,6 +172,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -167,6 +183,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -174,6 +191,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L)) .duration(7 * SECONDS + 10 * TICKS) .eut(90) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -183,6 +201,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(7 * SECONDS + 10 * TICKS) .eut(90) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -192,6 +211,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)) .duration(7 * SECONDS + 10 * TICKS) .eut(90) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -199,6 +219,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L)) .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -208,6 +229,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -217,6 +239,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 6L)) .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -224,6 +247,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 2L)) .duration(10 * SECONDS + 10 * TICKS) .eut(150) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -231,6 +255,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3)) .duration(10 * SECONDS + 10 * TICKS) .eut(150) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -240,6 +265,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 6L)) .duration(10 * SECONDS + 10 * TICKS) .eut(150) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -247,6 +273,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -256,6 +283,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -265,6 +293,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.StainlessSteel, 6L)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -272,6 +301,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 2L)) .duration(13 * SECONDS + 10 * TICKS) .eut(210) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -281,6 +311,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(13 * SECONDS + 10 * TICKS) .eut(210) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -290,6 +321,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Titanium, 6L)) .duration(13 * SECONDS + 10 * TICKS) .eut(210) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -297,6 +329,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -306,6 +339,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -315,6 +349,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.TungstenSteel, 6L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -322,6 +357,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 2L)) .duration(16 * SECONDS + 10 * TICKS) .eut(270) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -331,6 +367,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(16 * SECONDS + 10 * TICKS) .eut(270) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -340,6 +377,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L)) .duration(16 * SECONDS + 10 * TICKS) .eut(270) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -347,6 +385,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 2L)) .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -356,6 +395,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -365,6 +405,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L)) .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -372,6 +413,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 2L)) .duration(18 * SECONDS) .eut(330) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -381,6 +423,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(18 * SECONDS) .eut(330) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -390,6 +433,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L)) .duration(18 * SECONDS) .eut(330) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -397,6 +441,7 @@ public class ArcFurnaceRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 2L)) .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -406,6 +451,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() @@ -415,6 +461,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neutronium, 6L)) .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) + .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 897ea7f57d..0f5023e854 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -19,8 +19,8 @@ import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.enums.Mods.TwilightForest; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; import static gregtech.api.util.GT_RecipeBuilder.EIGHTH_INGOT; import static gregtech.api.util.GT_RecipeBuilder.HALF_INGOT; import static gregtech.api.util.GT_RecipeBuilder.INGOTS; @@ -77,7 +77,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.SeedOil.getFluid(50L)) .duration(16 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -87,7 +87,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Concrete.getMolten(144)) .duration(10 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -97,7 +97,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Concrete.getMolten(144)) .duration(10 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); for (byte i = 0; i < 16; i = (byte) (i + 1)) { for (int j = 0; j < Dyes.VALUES[i].getSizeOfFluidList(); j++) { @@ -108,7 +108,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 24)) .duration(6 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } } @@ -120,7 +120,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(20)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -130,7 +130,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(20)) .duration(20 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -140,7 +140,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Component_Filter.get(1)) .duration(1 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -151,7 +151,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(144)) .duration(1 * MINUTES + 20 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -162,7 +162,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.AdvancedGlue.getFluid(500)) .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -173,7 +173,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.AdvancedGlue.getFluid(250)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -183,7 +183,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.FluidRegulator_LV.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -193,7 +193,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.FluidRegulator_MV.get(1)) .duration(17 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -203,7 +203,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.FluidRegulator_HV.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -213,7 +213,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.FluidRegulator_EV.get(1)) .duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -223,7 +223,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.FluidRegulator_IV.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -233,7 +233,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.FluidRegulator_LuV.get(1)) .duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -243,7 +243,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.FluidRegulator_ZPM.get(1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -253,7 +253,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.FluidRegulator_UV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(500000) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -263,7 +263,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Steam_Regulator_LV.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -273,7 +273,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Steam_Regulator_MV.get(1)) .duration(17 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -283,7 +283,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Steam_Regulator_HV.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -293,7 +293,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Steam_Regulator_EV.get(1)) .duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -303,7 +303,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Steam_Regulator_IV.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -314,7 +314,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Steam_Valve_LV.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -325,7 +325,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Steam_Valve_MV.get(1)) .duration(17 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -336,7 +336,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Steam_Valve_HV.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -347,7 +347,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Steam_Valve_EV.get(1)) .duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -358,7 +358,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Steam_Valve_IV.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -368,7 +368,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Schematic.get(1L)) .duration(30 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -378,7 +378,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Schematic.get(1L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -388,7 +388,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Schematic.get(1L)) .duration(7 * SECONDS + 10 * TICKS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -401,7 +401,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Energy_HV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -414,7 +414,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Energy_EV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -427,7 +427,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Energy_IV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -440,7 +440,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Energy_HV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -453,7 +453,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Energy_EV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -466,7 +466,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Energy_IV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -479,7 +479,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Dynamo_HV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -492,7 +492,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Dynamo_EV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -505,7 +505,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Dynamo_IV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -518,7 +518,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Dynamo_HV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -531,7 +531,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Dynamo_EV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -544,7 +544,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Dynamo_IV.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -556,7 +556,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Tin.getMolten(144L)) .duration(15 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -568,7 +568,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Tin.getMolten(144L)) .duration(15 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -579,7 +579,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Tin.getMolten(144L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -590,7 +590,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Tin.getMolten(144L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -601,7 +601,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glass.getMolten(2304L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -612,7 +612,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glass.getMolten(2304L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -623,7 +623,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2304L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -634,7 +634,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2304L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -645,7 +645,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(2304L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -656,7 +656,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(2304L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UHV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -667,7 +667,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_Gearbox_TungstenSteel.get(1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); { // limiting lifetime of the variables ItemStack flask = ItemList.VOLUMETRIC_FLASK.get(1); @@ -685,7 +685,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(flask) .duration(10 * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } } @@ -699,7 +699,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Muffler_LV.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -711,7 +711,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Muffler_MV.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -723,7 +723,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Muffler_HV.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -735,7 +735,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Muffler_EV.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -747,7 +747,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Muffler_IV.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -759,7 +759,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Muffler_LuV.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -771,7 +771,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Muffler_ZPM.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -783,7 +783,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Muffler_UV.get(1)) .duration(10 * SECONDS) .eut(500000) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -795,7 +795,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hatch_Muffler_MAX.get(1)) .duration(10 * SECONDS) .eut(2000000) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -805,7 +805,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Concrete.getMolten(144)) .duration(4 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.leather, 1, 32767), new ItemStack(Items.lead, 1, 32767)) @@ -813,7 +813,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(72)) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -823,7 +823,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(72)) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -832,7 +832,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.map, 1, 0)) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -842,14 +842,14 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(144)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(TwilightForest.ID, "item.charmOfLife1", 4L, 0), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfLife2", 1L, 0)) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -858,7 +858,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping2", 1L, 0)) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -867,14 +867,14 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping3", 1L, 0)) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(TwilightForest.ID, "item.charmOfLife2", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfLife1", 4L, 0)) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -883,7 +883,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping1", 4L, 0)) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -892,7 +892,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping2", 4L, 0)) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -902,7 +902,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Redstone.getMolten(144)) .duration(3 * SECONDS + 4 * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -912,7 +912,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Redstone.getMolten(144)) .duration(3 * SECONDS + 4 * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -922,7 +922,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Redstone.getMolten(144)) .duration(3 * SECONDS + 4 * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -931,7 +931,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 0)) .duration(3 * SECONDS + 4 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -940,7 +940,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 600)) .duration(3 * SECONDS + 4 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -949,7 +949,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 1200)) .duration(3 * SECONDS + 4 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.FR_Wax.get(6), new ItemStack(Items.string, 1, 32767)) @@ -957,7 +957,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(600)) .duration(3 * SECONDS + 4 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.FR_Wax.get(2), ItemList.FR_Silk.get(1)) @@ -965,7 +965,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(200)) .duration(16 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.FR_Silk.get(9), GT_Utility.getIntegratedCircuit(9)) @@ -973,14 +973,14 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(500)) .duration(3 * SECONDS + 4 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Forestry.ID, "propolis", 5L, 2), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(getModItem(Forestry.ID, "craftingMaterial", 1L, 1)) .duration(16 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -990,7 +990,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(5000)) .duration(3 * SECONDS + 4 * TICKS) .eut(32) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -999,7 +999,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.FR_Casing_Sturdy.get(1)) .duration(1 * SECONDS + 12 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1009,28 +1009,28 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Creosote.getFluid(1000)) .duration(2 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Forestry.ID, "craftingMaterial", 5L, 1), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1)) .duration(3 * SECONDS + 4 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.piston, 1, 32767), new ItemStack(Items.slime_ball, 1, 32767)) .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.piston, 1, 32767), ItemList.IC2_Resin.get(1)) .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.piston, 1, 32767), GT_Utility.getIntegratedCircuit(1)) @@ -1038,7 +1038,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(100)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1049,7 +1049,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(300)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1060,7 +1060,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(200)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1071,7 +1071,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(100)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // Maintenance Hatch Recipes Using BrainTech + Refined Glue. Info: One BrainTech Recipe Is In GT+ü Originally. // The Maintenance Hatch Recipe using SuperGlue is there. @@ -1082,7 +1082,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(1000)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1092,7 +1092,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(20)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1102,7 +1102,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(20)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1112,7 +1112,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(20)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Paper_Printed_Pages.get(1), new ItemStack(Items.leather, 1, 32767)) @@ -1120,7 +1120,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(20)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1130,14 +1130,14 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(20)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 4)) .itemOutputs(ItemList.Cell_Universal_Fluid.get(1)) .duration(6 * SECONDS + 8 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Baked_Cake.get(1), new ItemStack(Items.egg, 1, 0)) @@ -1145,49 +1145,49 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Milk.getFluid(3000)) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Bun.get(2), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Food_Sliced_Buns.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Bread.get(2), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Food_Sliced_Breads.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Baguette.get(2), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Food_Sliced_Baguettes.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Buns.get(1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Food_Sliced_Bun.get(2)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Breads.get(1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Food_Sliced_Bread.get(2)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Baguettes.get(1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Food_Sliced_Baguette.get(2)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1196,7 +1196,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Food_Burger_Meat.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1205,35 +1205,35 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Food_Burger_Meat.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Bun.get(2), ItemList.Food_Chum.get(1)) .itemOutputs(ItemList.Food_Burger_Chum.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Buns.get(1), ItemList.Food_Chum.get(1)) .itemOutputs(ItemList.Food_Burger_Chum.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Bun.get(2), ItemList.Food_Sliced_Cheese.get(3)) .itemOutputs(ItemList.Food_Burger_Cheese.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Buns.get(1), ItemList.Food_Sliced_Cheese.get(3)) .itemOutputs(ItemList.Food_Burger_Cheese.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1242,14 +1242,14 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Food_Raw_Pizza_Meat.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Flat_Dough.get(1), ItemList.Food_Sliced_Cheese.get(3)) .itemOutputs(ItemList.Food_Raw_Pizza_Cheese.get(1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // SC craft @@ -1263,7 +1263,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Helium.getGas(2000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1275,7 +1275,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Helium.getGas(4000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1287,7 +1287,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Helium.getGas(6000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1299,7 +1299,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Helium.getGas(8000)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1314,7 +1314,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Helium.getGas(12000)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1326,7 +1326,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Helium.getGas(16000)) .duration(1 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1338,7 +1338,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Helium.getGas(20000)) .duration(1 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_UV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1350,7 +1350,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Helium.getGas(24000)) .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UHV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1360,7 +1360,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.ULV_Coil.get(1)) .duration(10 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1370,7 +1370,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.LV_Coil.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1380,7 +1380,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.MV_Coil.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1390,7 +1390,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.HV_Coil.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1400,7 +1400,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.EV_Coil.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1410,7 +1410,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.IV_Coil.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1420,7 +1420,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.LuV_Coil.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1430,7 +1430,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.ZPM_Coil.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1440,7 +1440,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.UV_Coil.get(1)) .duration(10 * SECONDS) .eut(500000) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1450,7 +1450,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.UHV_Coil.get(1)) .duration(10 * SECONDS) .eut(2000000) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1460,7 +1460,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(10)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1470,7 +1470,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(20)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1480,7 +1480,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(60)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1491,7 +1491,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Ingot_IridiumAlloy.get(1)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1503,7 +1503,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_Grate.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1515,7 +1515,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_Vent_T2.get(1)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) { GT_Values.RA.stdBuilder() @@ -1525,7 +1525,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.torch, 4)) .duration(2 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } GT_Values.RA.stdBuilder() @@ -1535,7 +1535,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.light_weighted_pressure_plate, 1)) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1544,7 +1544,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.heavy_weighted_pressure_plate, 1)) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1553,7 +1553,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.iron_door, 1)) .duration(30 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1562,7 +1562,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.cauldron, 1)) .duration(35 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1571,7 +1571,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("ironFence", 1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1580,7 +1580,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.iron_bars, 4)) .duration(15 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1589,7 +1589,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.iron_door, 1)) .duration(30 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1598,7 +1598,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.cauldron, 1)) .duration(35 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1607,7 +1607,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("ironFence", 1)) .duration(5 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1616,7 +1616,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.iron_bars, 4)) .duration(15 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1625,7 +1625,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.fence, 1)) .duration(15 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1634,7 +1634,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.tripwire_hook, 1)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1643,7 +1643,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.tripwire_hook, 1)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1652,7 +1652,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.bow, 1)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1661,7 +1661,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.minecart, 1)) .duration(5 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1670,7 +1670,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.minecart, 1)) .duration(4 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1679,7 +1679,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.minecart, 1)) .duration(5 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1688,7 +1688,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Component_Minecart_Wheels_Iron.get(1)) .duration(5 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1697,7 +1697,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Component_Minecart_Wheels_Iron.get(1)) .duration(4 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1706,77 +1706,77 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Component_Minecart_Wheels_Steel.get(1)) .duration(3 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.hopper, 1, 32767)) .itemOutputs(new ItemStack(Items.hopper_minecart, 1)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.tnt, 1, 32767)) .itemOutputs(new ItemStack(Items.tnt_minecart, 1)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.chest, 1, 32767)) .itemOutputs(new ItemStack(Items.chest_minecart, 1)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.trapped_chest, 1, 32767)) .itemOutputs(new ItemStack(Items.chest_minecart, 1)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.furnace, 1, 32767)) .itemOutputs(new ItemStack(Items.furnace_minecart, 1)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.tripwire_hook, 1), new ItemStack(Blocks.chest, 1, 32767)) .itemOutputs(new ItemStack(Blocks.trapped_chest, 1)) .duration(10 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.stone, 1, 0), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 0)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.sandstone, 1, 0), GT_Utility.getIntegratedCircuit(23)) .itemOutputs(new ItemStack(Blocks.sandstone, 1, 2)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.sandstone, 1, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(new ItemStack(Blocks.sandstone, 1, 0)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(new ItemStack(Blocks.sandstone, 1, 0)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1785,7 +1785,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("machine", 1)) .duration(1 * SECONDS + 5 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1794,7 +1794,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_ULV.get(1)) .duration(1 * SECONDS + 5 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1803,7 +1803,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_LV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1812,7 +1812,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_MV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1821,7 +1821,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_HV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1830,7 +1830,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_EV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1839,7 +1839,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_IV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1848,7 +1848,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_LuV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1857,7 +1857,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_ZPM.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1866,7 +1866,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_UV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1875,7 +1875,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_MAX.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1884,7 +1884,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_HeatProof.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1894,7 +1894,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_SolidSteel.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1903,7 +1903,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_FrostProof.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1912,7 +1912,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_RobustTungstenSteel.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1921,7 +1921,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_CleanStainlessSteel.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1930,7 +1930,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_StableTitanium.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1939,7 +1939,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_MiningOsmiridium.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1948,7 +1948,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_MiningNeutronium.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1957,7 +1957,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_MiningBlackPlutonium.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 4), ItemList.Casing_LuV.get(1)) @@ -1965,7 +1965,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.HSSG.getMolten(288)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1975,7 +1975,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.NaquadahAlloy.getMolten(288)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1984,7 +1984,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_Turbine.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1993,7 +1993,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_Turbine1.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2002,7 +2002,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_Turbine2.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2011,14 +2011,14 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_Turbine3.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6), ItemList.Casing_Turbine.get(1)) .itemOutputs(ItemList.Casing_TurbineGasAdvanced.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_SolidSteel.get(1), GT_Utility.getIntegratedCircuit(6)) @@ -2026,7 +2026,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(216)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2035,7 +2035,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_Advanced_Iridium.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); if (GT_Mod.gregtechproxy.mHardMachineCasings) { GT_Values.RA.stdBuilder() @@ -2046,7 +2046,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(288)) .duration(1 * SECONDS + 5 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2056,7 +2056,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(288)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2066,7 +2066,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(288)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2076,7 +2076,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(288)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2086,7 +2086,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(288)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2096,7 +2096,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(288)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2106,7 +2106,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2116,7 +2116,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2126,7 +2126,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2136,7 +2136,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2146,7 +2146,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } else { GT_Values.RA.stdBuilder() .itemInputs( @@ -2155,7 +2155,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_ULV.get(1)) .duration(1 * SECONDS + 5 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2164,7 +2164,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_LV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2173,7 +2173,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_MV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2182,7 +2182,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_MV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2191,7 +2191,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_HV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2200,7 +2200,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_EV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2209,7 +2209,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_IV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2218,7 +2218,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_LuV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2227,7 +2227,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_ZPM.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2236,7 +2236,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_UV.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2245,7 +2245,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Hull_MAX.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } GT_Values.RA.stdBuilder() @@ -2256,7 +2256,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(144)) .duration(4 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2266,7 +2266,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(432)) .duration(16 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2276,7 +2276,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(432)) .duration(16 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2286,42 +2286,42 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(1296)) .duration(1 * MINUTES + 4 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.string, 4, 32767), new ItemStack(Items.slime_ball, 1, 32767)) .itemOutputs(new ItemStack(Items.lead, 2)) .duration(2 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Compressed_Coal_Ball.get(8), new ItemStack(Blocks.brick_block, 1)) .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("waterMill", 2), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_ModHandler.getIC2Item("generator", 1)) .duration(5 * MINUTES + 20 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("batPack", 1L, 32767), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.IC2_ReBattery.get(6)) .duration(40 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("carbonFiber", 2), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_ModHandler.getIC2Item("carbonMesh", 1)) .duration(8 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2330,7 +2330,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("waterMill", 2)) .duration(5 * MINUTES + 20 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2339,7 +2339,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.hopper)) .duration(8 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2348,7 +2348,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.hopper)) .duration(8 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2357,7 +2357,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.hopper)) .duration(8 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2366,7 +2366,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.hopper)) .duration(8 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2375,7 +2375,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("windMill", 1)) .duration(5 * MINUTES + 20 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2384,7 +2384,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Component_Sawblade_Diamond.get(1)) .duration(16 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2393,7 +2393,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.redstone_torch, 1)) .duration(1 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2402,7 +2402,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.torch, 2)) .duration(2 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2411,21 +2411,21 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.torch, 6)) .duration(2 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), ItemList.IC2_Resin.get(1)) .itemOutputs(new ItemStack(Blocks.torch, 6)) .duration(2 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 8), new ItemStack(Items.flint, 1)) .itemOutputs(ItemList.IC2_Compressed_Coal_Ball.get(1)) .duration(20 * SECONDS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); if (!GT_Mod.gregtechproxy.mDisableIC2Cables) { GT_Values.RA.stdBuilder() @@ -2435,7 +2435,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("insulatedTinCableItem", 1)) .duration(1 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2444,7 +2444,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1)) .duration(1 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2453,7 +2453,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1)) .duration(2 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2462,7 +2462,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("insulatedIronCableItem", 1)) .duration(3 * SECONDS) .eut(20) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } GT_Values.RA.stdBuilder() .itemInputs( @@ -2471,7 +2471,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.wooden_sword, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2480,7 +2480,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.stone_sword, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2489,7 +2489,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.iron_sword, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2498,7 +2498,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.golden_sword, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2507,7 +2507,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.diamond_sword, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2516,7 +2516,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Tool_Sword_Bronze.getUndamaged(1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2525,7 +2525,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Tool_Sword_Steel.getUndamaged(1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2534,7 +2534,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.wooden_pickaxe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2543,7 +2543,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.stone_pickaxe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2552,7 +2552,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.iron_pickaxe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2561,7 +2561,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.golden_pickaxe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2570,7 +2570,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.diamond_pickaxe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2579,7 +2579,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Tool_Pickaxe_Bronze.getUndamaged(1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2588,7 +2588,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Tool_Pickaxe_Steel.getUndamaged(1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2597,7 +2597,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.wooden_shovel, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2606,7 +2606,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.stone_shovel, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2615,7 +2615,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.iron_shovel, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2624,7 +2624,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.golden_shovel, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2633,7 +2633,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.diamond_shovel, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2642,7 +2642,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Tool_Shovel_Bronze.getUndamaged(1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2651,7 +2651,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Tool_Shovel_Steel.getUndamaged(1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2660,7 +2660,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.wooden_axe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2669,7 +2669,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.stone_axe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2678,7 +2678,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.iron_axe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2687,7 +2687,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.golden_axe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2696,7 +2696,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.diamond_axe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2705,7 +2705,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Tool_Axe_Bronze.getUndamaged(1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2714,7 +2714,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Tool_Axe_Steel.getUndamaged(1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2723,7 +2723,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.wooden_hoe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2732,7 +2732,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.stone_hoe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2741,7 +2741,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.iron_hoe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2750,7 +2750,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.golden_hoe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2759,7 +2759,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.diamond_hoe, 1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2768,7 +2768,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Tool_Hoe_Bronze.getUndamaged(1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2777,7 +2777,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Tool_Hoe_Steel.getUndamaged(1)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // fuel rod assembler recipes @@ -2789,7 +2789,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.ThoriumCell_2.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2799,7 +2799,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.ThoriumCell_4.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2809,7 +2809,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.ThoriumCell_4.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2819,7 +2819,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Uraniumcell_2.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2829,7 +2829,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Uraniumcell_4.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2839,7 +2839,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Uraniumcell_4.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2849,7 +2849,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Moxcell_2.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2859,7 +2859,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Moxcell_4.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2869,7 +2869,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Moxcell_4.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2879,7 +2879,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.NaquadahCell_2.get(1)) .duration(5 * SECONDS) .eut(400) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2889,7 +2889,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.NaquadahCell_4.get(1)) .duration(7 * SECONDS + 10 * TICKS) .eut(400) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2899,7 +2899,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.NaquadahCell_4.get(1)) .duration(5 * SECONDS) .eut(400) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2909,7 +2909,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.MNqCell_2.get(1)) .duration(5 * SECONDS) .eut(400) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2919,7 +2919,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.MNqCell_4.get(1)) .duration(7 * SECONDS + 10 * TICKS) .eut(400) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2929,7 +2929,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.MNqCell_4.get(1)) .duration(5 * SECONDS) .eut(400) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2938,7 +2938,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.neutroniumHeatCapacitor.get(1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2947,14 +2947,14 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RadiantNaquadahAlloyCasing.get(1)) .duration(10 * TICKS) .eut(400000) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.KevlarFiber.get(8), GT_Utility.getIntegratedCircuit(8)) .itemOutputs(ItemList.WovenKevlar.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2967,7 +2967,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.SolderingAlloy.getMolten(INGOTS)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); ItemStack[] plates = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), @@ -2984,7 +2984,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(40 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2995,7 +2995,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(40 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3006,7 +3006,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(40 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3017,7 +3017,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(40 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("ecMeter", 1), tPlate, GT_Utility.getIntegratedCircuit(1)) @@ -3025,7 +3025,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(40 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } } @@ -3046,7 +3046,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3057,7 +3057,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3068,7 +3068,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * EIGHTH_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3079,7 +3079,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(4)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // LV input bus @@ -3090,7 +3090,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(1)) @@ -3098,7 +3098,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(1)) @@ -3106,7 +3106,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(1)) @@ -3114,7 +3114,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(9)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // MV input bus @@ -3128,7 +3128,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3139,7 +3139,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3150,7 +3150,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * EIGHTH_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // HV input bus @@ -3164,7 +3164,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(3 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3175,7 +3175,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3186,7 +3186,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * QUARTER_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // EV input bus @@ -3200,7 +3200,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(4 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3211,7 +3211,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // IV input bus @@ -3225,7 +3225,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(8 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3236,7 +3236,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // LuV input bus @@ -3250,7 +3250,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3261,7 +3261,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // ZPM input bus @@ -3275,7 +3275,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(4 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // UV input bus @@ -3289,7 +3289,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(8 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // UHV input bus @@ -3303,7 +3303,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UHV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } } @@ -3332,7 +3332,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3343,7 +3343,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3354,7 +3354,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * EIGHTH_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3365,7 +3365,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(4)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // LV output bus @@ -3376,7 +3376,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(2)) @@ -3384,7 +3384,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(2)) @@ -3392,7 +3392,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(2)) @@ -3400,7 +3400,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(9)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } if (!IronChests.isModLoaded()) { @@ -3418,7 +3418,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3429,7 +3429,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3440,7 +3440,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * EIGHTH_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // HV output bus @@ -3454,7 +3454,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(3 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3465,7 +3465,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3476,7 +3476,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * QUARTER_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // EV output bus @@ -3490,7 +3490,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(4 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3501,7 +3501,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // IV output bus @@ -3515,7 +3515,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(8 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3526,7 +3526,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // LuV output bus @@ -3540,7 +3540,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3551,7 +3551,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // ZPM output bus @@ -3565,7 +3565,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(4 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // UV output bus @@ -3579,7 +3579,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(8 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } if (!AvaritiaAddons.isModLoaded()) { @@ -3597,7 +3597,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UHV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } } @@ -3616,7 +3616,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3627,7 +3627,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3638,7 +3638,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * EIGHTH_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3649,7 +3649,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(4)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } /* @@ -3672,7 +3672,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3683,7 +3683,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3694,7 +3694,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3705,7 +3705,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(9)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } if (!IronTanks.isModLoaded()) { @@ -3723,7 +3723,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3734,7 +3734,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3745,7 +3745,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * EIGHTH_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // HV input hatch @@ -3759,7 +3759,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(3 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3770,7 +3770,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3781,7 +3781,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * QUARTER_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // EV input hatch @@ -3795,7 +3795,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(4 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3806,7 +3806,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // IV input hatch @@ -3820,7 +3820,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(8 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3831,7 +3831,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // LuV input hatch @@ -3845,7 +3845,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3856,7 +3856,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // ZPM input hatch @@ -3870,7 +3870,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(4 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // UV input hatch @@ -3881,7 +3881,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(8 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // UHV input hatch @@ -3892,7 +3892,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UHV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } } @@ -3911,7 +3911,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3922,7 +3922,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3933,7 +3933,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * EIGHTH_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3944,7 +3944,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(4)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ULV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } /* @@ -3967,7 +3967,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3978,7 +3978,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3989,7 +3989,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4000,7 +4000,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(9)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } if (!IronTanks.isModLoaded()) { @@ -4018,7 +4018,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4029,7 +4029,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4040,7 +4040,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * EIGHTH_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // HV output hatch @@ -4054,7 +4054,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(3 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4065,7 +4065,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4076,7 +4076,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * QUARTER_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // EV output hatch @@ -4090,7 +4090,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(4 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4101,7 +4101,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * HALF_INGOT)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // IV output hatch @@ -4115,7 +4115,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(8 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4126,7 +4126,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // LuV output hatch @@ -4140,7 +4140,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4151,7 +4151,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(2 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // ZPM output hatch @@ -4165,7 +4165,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(4 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // UV output hatch @@ -4176,7 +4176,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(8 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // UHV output hatch @@ -4187,7 +4187,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UHV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } } @@ -4205,7 +4205,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Tie_Stone.get(1)) .duration(6 * SECONDS + 8 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4215,7 +4215,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Tie_Stone.get(1)) .duration(6 * SECONDS + 8 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4226,7 +4226,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Blaze.getMolten(216)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4237,7 +4237,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.ConductiveIron.getMolten(432)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4248,7 +4248,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.VibrantAlloy.getMolten(216)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4259,7 +4259,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.CrystallineAlloy.getMolten(216)) .duration(5 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4270,7 +4270,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Redstone.getMolten(216)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4281,7 +4281,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.RedAlloy.getMolten(216)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4292,7 +4292,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.ConductiveIron.getMolten(216)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4303,7 +4303,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.VibrantAlloy.getMolten(216)) .duration(5 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4313,7 +4313,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Electric.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4323,7 +4323,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Electric.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4333,7 +4333,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Electric.get(2)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4343,7 +4343,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Electric.get(4)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4353,7 +4353,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Electric.get(8)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4363,7 +4363,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Electric.get(16)) .duration(2 * SECONDS + 10 * TICKS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4373,7 +4373,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Electric.get(32)) .duration(2 * SECONDS + 10 * TICKS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4383,7 +4383,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Electric.get(64)) .duration(2 * SECONDS + 10 * TICKS) .eut(96) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4393,7 +4393,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Wooden.get(8)) .duration(6 * SECONDS + 13 * TICKS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4403,7 +4403,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Wooden.get(8)) .duration(6 * SECONDS + 13 * TICKS) .eut(4) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4413,7 +4413,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Wooden.get(16)) .duration(6 * SECONDS + 13 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4423,7 +4423,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Wooden.get(32)) .duration(6 * SECONDS + 13 * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4433,35 +4433,35 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Wooden.get(64)) .duration(6 * SECONDS + 13 * TICKS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.RC_Tie_Wood.get(32), GT_Utility.getIntegratedCircuit(20)) .itemOutputs(ItemList.RC_Bed_Wood.get(24)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.RC_Tie_Wood.get(64), GT_Utility.getIntegratedCircuit(24)) .itemOutputs(ItemList.RC_Bed_Wood.get(48)) .duration(10 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.RC_Tie_Stone.get(32), GT_Utility.getIntegratedCircuit(20)) .itemOutputs(ItemList.RC_Bed_Stone.get(24)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.RC_Tie_Stone.get(64), GT_Utility.getIntegratedCircuit(24)) .itemOutputs(ItemList.RC_Bed_Stone.get(48)) .duration(10 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); ItemStack tRailWood = getModItem(Railcraft.ID, "track", 64, 736); if (tRailWood != null) { @@ -4482,7 +4482,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailWood) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4492,7 +4492,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailWoodB) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } GT_Values.RA.stdBuilder() .itemInputs( @@ -4503,7 +4503,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.golden_rail, 16, 0)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4513,7 +4513,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.rail, 64, 0)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); ItemStack tRailRe = getModItem(Railcraft.ID, "track", 64); NBTTagCompound tTagRe = new NBTTagCompound(); @@ -4528,7 +4528,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailRe) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); ItemStack tRailReB = getModItem(Railcraft.ID, "track.reinforced", 16); NBTTagCompound tTagReB = new NBTTagCompound(); @@ -4543,7 +4543,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailReB) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); ItemStack tRailEl = getModItem(Railcraft.ID, "track", 64); NBTTagCompound tTagEl = new NBTTagCompound(); @@ -4558,7 +4558,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailEl) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); ItemStack tRailHs = getModItem(Railcraft.ID, "track", 64, 816); if (tRailHs != null) { @@ -4574,7 +4574,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailHs) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } ItemStack tRailHsB = getModItem(Railcraft.ID, "track.speed", 16); NBTTagCompound tTagHsB = new NBTTagCompound(); @@ -4589,7 +4589,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailHsB) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // --- Wooden Switch Track --- ItemStack tRailSS = getModItem(Railcraft.ID, "track.slow", 1, 19986); @@ -4606,7 +4606,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailSS) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4616,7 +4616,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailSS)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4626,7 +4626,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailSS)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4636,7 +4636,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailSS)) .duration(5 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4646,7 +4646,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailSS)) .duration(5 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4656,7 +4656,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailSS)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4666,7 +4666,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailSS)) .duration(5 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Wooden Wye Track --- ItemStack tRailSW = getModItem(Railcraft.ID, "track.slow", 1); @@ -4683,7 +4683,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailSW) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4693,7 +4693,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailSW)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4703,7 +4703,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailSW)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4713,7 +4713,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailSW)) .duration(5 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4723,7 +4723,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailSW)) .duration(5 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4733,7 +4733,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailSW)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4743,7 +4743,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailSW)) .duration(5 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Wooden Junction Tack --- ItemStack tRailSJ = getModItem(Railcraft.ID, "track.slow", 1); @@ -4760,7 +4760,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailSJ) .duration(5 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4770,7 +4770,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailSJ)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4780,7 +4780,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailSJ)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4790,7 +4790,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailSJ)) .duration(5 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4800,7 +4800,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailSJ)) .duration(5 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4810,7 +4810,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailSJ)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4820,7 +4820,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailSJ)) .duration(5 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Switch Tack --- ItemStack tRailNS = getModItem(Railcraft.ID, "track", 1, 4767); @@ -4837,7 +4837,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailNS) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4847,7 +4847,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailNS)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4857,7 +4857,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailNS)) .duration(10 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4867,7 +4867,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailNS)) .duration(10 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4877,7 +4877,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailNS)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4887,7 +4887,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailNS)) .duration(10 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4897,7 +4897,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailNS)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Wye Tack --- @@ -4915,7 +4915,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailNW) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4925,7 +4925,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailNW)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4935,7 +4935,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailNW)) .duration(10 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4945,7 +4945,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailNW)) .duration(10 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4955,7 +4955,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailNW)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4965,7 +4965,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailNW)) .duration(10 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4975,7 +4975,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailNW)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Junction Tack --- ItemStack tRailNJ = getModItem(Railcraft.ID, "track", 1); @@ -4992,7 +4992,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailNJ) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5002,7 +5002,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailNJ)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5012,7 +5012,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailNJ)) .duration(10 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5022,7 +5022,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailNJ)) .duration(10 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5032,7 +5032,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailNJ)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5042,7 +5042,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailNJ)) .duration(10 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5052,7 +5052,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailNJ)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Reinforced Switch Track --- ItemStack tRailRS = getModItem(Railcraft.ID, "track.reinforced", 1); @@ -5069,7 +5069,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailRS) .duration(15 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5079,7 +5079,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailRS)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5089,7 +5089,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailRS)) .duration(15 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5099,7 +5099,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailRS)) .duration(15 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5109,7 +5109,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailRS)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5119,7 +5119,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailRS)) .duration(15 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5129,7 +5129,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailRS)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Reinforced Wye Track --- ItemStack tRailRW = getModItem(Railcraft.ID, "track.reinforced", 1); @@ -5146,7 +5146,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailRW) .duration(15 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5156,7 +5156,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailRW)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5166,7 +5166,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailRW)) .duration(15 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5176,7 +5176,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailRW)) .duration(15 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5186,7 +5186,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailRW)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5196,7 +5196,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailRW)) .duration(15 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5206,7 +5206,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailRW)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Reinforced Junction Track --- ItemStack tRailRJ = getModItem(Railcraft.ID, "track.reinforced", 1, 764); @@ -5223,7 +5223,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailRJ) .duration(15 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5233,7 +5233,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailRJ)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5243,7 +5243,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailRJ)) .duration(15 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5253,7 +5253,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailRJ)) .duration(15 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5263,7 +5263,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailRJ)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5273,7 +5273,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailRJ)) .duration(15 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5283,7 +5283,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailRJ)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- H.S. Switch Track --- ItemStack tRailSSw = getModItem(Railcraft.ID, "track.speed", 1, 7916); @@ -5300,7 +5300,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailSSw) .duration(20 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5310,7 +5310,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailSSw)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5320,7 +5320,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailSSw)) .duration(20 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5330,7 +5330,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailSSw)) .duration(20 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5340,7 +5340,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailSSw)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5350,7 +5350,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailSSw)) .duration(20 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5360,7 +5360,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailSSw)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- H.S. Wye Track --- ItemStack tRailSWy = getModItem(Railcraft.ID, "track.speed", 1); @@ -5377,7 +5377,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailSWy) .duration(20 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5387,7 +5387,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailSWy)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5397,7 +5397,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailSWy)) .duration(20 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5407,7 +5407,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailSWy)) .duration(20 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5417,7 +5417,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailSWy)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5427,7 +5427,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailSWy)) .duration(20 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5437,7 +5437,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailSWy)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- H.S. Transition Track --- ItemStack tRailSTt = getModItem(Railcraft.ID, "track.speed", 1, 26865); @@ -5455,7 +5455,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailSTt)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5466,7 +5466,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailSTt)) .duration(20 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5477,7 +5477,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailSTt)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5488,7 +5488,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailSTt)) .duration(20 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5499,7 +5499,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailSTt)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Electric Switch Track --- ItemStack tRailES = getModItem(Railcraft.ID, "track.electric", 1, 10488); @@ -5516,7 +5516,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailES) .duration(20 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5526,7 +5526,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailES)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5536,7 +5536,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailES)) .duration(20 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5546,7 +5546,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailES)) .duration(20 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5556,7 +5556,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailES)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5566,7 +5566,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailES)) .duration(20 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5576,7 +5576,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailES)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Electric Wye Track --- ItemStack tRailEw = getModItem(Railcraft.ID, "track.electric", 1); @@ -5593,7 +5593,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailEw) .duration(20 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5603,7 +5603,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailEw)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5613,7 +5613,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailEw)) .duration(20 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5623,7 +5623,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailEw)) .duration(20 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5633,7 +5633,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailEw)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5643,7 +5643,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailEw)) .duration(20 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5653,7 +5653,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailEw)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // --- Electric Junction Track --- ItemStack tRailEJ = getModItem(Railcraft.ID, "track.electric", 1); @@ -5670,7 +5670,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(tRailEJ) .duration(20 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5680,7 +5680,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(2, tRailEJ)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5690,7 +5690,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(4, tRailEJ)) .duration(20 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5700,7 +5700,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(8, tRailEJ)) .duration(20 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5710,7 +5710,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(16, tRailEJ)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5720,7 +5720,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(32, tRailEJ)) .duration(20 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5730,7 +5730,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_Utility.copyAmount(64, tRailEJ)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } // Shunting Wire for (Materials tMat : solderingMats) { @@ -5746,7 +5746,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5757,7 +5757,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5768,7 +5768,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) .duration(10 * SECONDS) .eut(24) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5779,7 +5779,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5790,7 +5790,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) .duration(10 * SECONDS) .eut(48) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5801,7 +5801,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) .duration(10 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5812,7 +5812,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // chunkloader upgrade OC @@ -5827,7 +5827,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(12 * SECONDS + 10 * TICKS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } @@ -5841,7 +5841,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.SeedOil.getFluid(250)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5853,7 +5853,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Lubricant.getFluid(125)) .duration(5 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5863,7 +5863,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 11)) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5873,7 +5873,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 7)) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5883,7 +5883,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 8)) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5893,7 +5893,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 9)) .duration(10 * SECONDS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5905,7 +5905,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1, 0)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5914,7 +5914,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5924,7 +5924,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 1)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5934,7 +5934,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 1)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5944,7 +5944,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5953,7 +5953,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) .duration(10 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5963,7 +5963,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 14)) .duration(20 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5973,7 +5973,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 14)) .duration(20 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5983,7 +5983,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .duration(20 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5992,7 +5992,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6002,7 +6002,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 1)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6012,7 +6012,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 1)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6022,7 +6022,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6031,7 +6031,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3)) .duration(10 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6041,7 +6041,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 4)) .duration(20 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6051,7 +6051,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 4)) .duration(20 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6061,7 +6061,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .duration(20 * SECONDS) .eut(256) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6070,7 +6070,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6080,7 +6080,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 7)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6090,7 +6090,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 7)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6100,7 +6100,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6109,7 +6109,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6119,7 +6119,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 10)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6129,7 +6129,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 10)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6139,7 +6139,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6148,7 +6148,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6158,7 +6158,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 13)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6168,7 +6168,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 13)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6178,7 +6178,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6187,7 +6187,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0)) .duration(10 * SECONDS) .eut(4096) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6197,7 +6197,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 1)) .duration(20 * SECONDS) .eut(4096) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6207,7 +6207,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 1)) .duration(20 * SECONDS) .eut(4096) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6217,7 +6217,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) .duration(20 * SECONDS) .eut(4096) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6226,7 +6226,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6236,7 +6236,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 4)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6246,7 +6246,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 4)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6256,7 +6256,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6265,7 +6265,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6275,7 +6275,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 7)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6285,7 +6285,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 7)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6295,7 +6295,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // Water Tank @@ -6307,7 +6307,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(36)) .duration(10 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6317,7 +6317,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(36)) .duration(10 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6327,7 +6327,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(36)) .duration(10 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6337,7 +6337,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(72)) .duration(20 * SECONDS) .eut(30) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6347,7 +6347,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(36)) .duration(20 * SECONDS) .eut(30) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6357,7 +6357,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(72)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // Steam Boilers @@ -6366,14 +6366,14 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 3)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Item_Casing_Steel.get(6), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 4)) .duration(20 * SECONDS) .eut(64) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } public void withBartWorks() { @@ -6388,7 +6388,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.Casing_Advanced_Rhodium_Palladium.get(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } @@ -6407,7 +6407,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.StainlessSteel.getMolten(72)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6418,7 +6418,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.TungstenSteel.getMolten(72)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6429,7 +6429,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.Platinum.getMolten(72)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } public void withGalaxySpace() { @@ -6447,7 +6447,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 2000)) .duration(16 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6459,7 +6459,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 4000)) .duration(16 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6471,7 +6471,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 6000)) .duration(16 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6483,7 +6483,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 8000)) .duration(32 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6498,7 +6498,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 12000)) .duration(32 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6510,7 +6510,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 16000)) .duration(1 * MINUTES + 4 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6522,7 +6522,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 20000)) .duration(1 * MINUTES + 4 * SECONDS) .eut(TierEU.RECIPE_UV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6534,7 +6534,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 24000)) .duration(2 * MINUTES + 8 * SECONDS) .eut(TierEU.RECIPE_UHV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6546,7 +6546,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 28000)) .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UEV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6558,7 +6558,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 36000)) .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UMV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } public void withGTNHLanthAndGTPP() { @@ -6581,7 +6581,7 @@ public class AssemblerRecipes implements Runnable { .fluidInputs(Materials.SolderingAlloy.getMolten(144)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } public void withIC2NuclearControl() { @@ -6596,7 +6596,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6605,7 +6605,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6614,14 +6614,14 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(IC2NuclearControl.ID, "RFSensorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -6630,7 +6630,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // counter @@ -6641,7 +6641,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // liquid @@ -6652,7 +6652,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // generator @@ -6663,7 +6663,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // 2-6 liquid @@ -6674,7 +6674,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // 2-6 energy @@ -6685,7 +6685,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // non-fluid nuke @@ -6696,21 +6696,21 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(IC2NuclearControl.ID, "CardAppeng", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.NC_SensorCard.get(1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 3)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java index d4b5606660..519d584136 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java @@ -1,8 +1,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -27,7 +27,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.EnergeticAlloy.getMolten(288)) .duration(30 * SECONDS) .eut(256) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Energium_Dust.get(9L)) @@ -36,7 +36,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.ConductiveIron.getMolten(576)) .duration(60 * SECONDS) .eut(256) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0)) @@ -45,7 +45,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(200L)) .duration(1 * MINUTES + 40 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600)) @@ -54,7 +54,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(200L)) .duration(1 * MINUTES + 40 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200)) @@ -63,7 +63,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(200L)) .duration(1 * MINUTES + 40 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0)) @@ -72,7 +72,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .duration(50 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600)) @@ -81,7 +81,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .duration(50 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200)) @@ -90,7 +90,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .duration(50 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0)) @@ -99,7 +99,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Void.getMolten(36L)) .duration(25 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600)) @@ -108,7 +108,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Void.getMolten(36L)) .duration(25 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200)) @@ -117,7 +117,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Void.getMolten(36L)) .duration(25 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 32)) @@ -126,7 +126,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Polybenzimidazole.getMolten(36L)) .duration(7 * SECONDS + 10 * TICKS) .eut((int) TierEU.RECIPE_EV) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64)) @@ -135,7 +135,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Epoxid.getMolten(144L)) .duration(15 * SECONDS) .eut((int) TierEU.RECIPE_HV) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64)) @@ -144,7 +144,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288L)) .duration(20 * SECONDS) .eut((int) TierEU.RECIPE_MV) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64)) @@ -153,7 +153,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Plastic.getMolten(576L)) .duration(30 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1)) @@ -162,7 +162,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.UUMatter.getFluid(576L)) .duration(60 * MINUTES) .eut((int) TierEU.RECIPE_HV) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(ItemList.QuantumStar.get(1L))) @@ -171,7 +171,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Neutronium.getMolten(288)) .duration(24 * SECONDS) .eut((int) TierEU.RECIPE_IV) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(ItemList.Gravistar.get(16L))) @@ -180,7 +180,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Infinity.getMolten(288)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UEV) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.SiliconDioxide.getDust(1)) @@ -189,7 +189,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(200L)) .duration(1 * MINUTES + 40 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.SiliconDioxide.getDust(1)) @@ -198,7 +198,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .duration(1 * MINUTES + 15 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.SiliconDioxide.getDust(1)) @@ -207,7 +207,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Void.getMolten(36L)) .duration(50 * SECONDS) .eut(24) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -218,7 +218,7 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(1000L)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -229,6 +229,6 @@ public class AutoclaveRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(1000L)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java index a2601392f2..192422437a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBenderRecipes; +import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -27,7 +27,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -36,7 +36,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -45,7 +45,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -54,7 +54,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -63,7 +63,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -72,7 +72,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -81,7 +81,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -90,7 +90,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -99,7 +99,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -108,7 +108,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -117,7 +117,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -126,7 +126,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -135,7 +135,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -144,7 +144,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -153,7 +153,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -162,7 +162,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -171,7 +171,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rebar.get(64L)) .duration(10 * SECONDS) .eut(200) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -180,7 +180,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rebar.get(64L)) .duration(10 * SECONDS) .eut(200) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -189,7 +189,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rebar.get(64L)) .duration(10 * SECONDS) .eut(200) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -198,7 +198,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rebar.get(64L)) .duration(10 * SECONDS) .eut(200) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -207,7 +207,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rebar.get(64L)) .duration(10 * SECONDS) .eut(200) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -216,7 +216,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rebar.get(64L)) .duration(10 * SECONDS) .eut(200) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -225,7 +225,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rebar.get(64L)) .duration(10 * SECONDS) .eut(200) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -234,7 +234,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rebar.get(64L)) .duration(10 * SECONDS) .eut(200) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -243,7 +243,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rebar.get(64L)) .duration(10 * SECONDS) .eut(200) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -252,14 +252,14 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.RC_Rebar.get(64L)) .duration(10 * SECONDS) .eut(200) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Mixed_Metal_Ingot.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 1L)) .duration(5 * SECONDS) .eut(8) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -268,7 +268,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.Cell_Empty.get(1L)) .duration(10 * SECONDS) .eut(8) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -277,7 +277,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.Cell_Empty.get(1L)) .duration(5 * SECONDS) .eut(8) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -286,7 +286,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(ItemList.Cell_Empty.get(4L)) .duration(5 * SECONDS) .eut(8) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -295,7 +295,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(new ItemStack(Items.bucket, 1, 0)) .duration(10 * SECONDS) .eut(4) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -304,7 +304,7 @@ public class BenderRecipes implements Runnable { .itemOutputs(new ItemStack(Items.bucket, 1, 0)) .duration(10 * SECONDS) .eut(4) - .addTo(sBenderRecipes); + .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -313,16 +313,18 @@ public class BenderRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", 1L)) .duration(5 * SECONDS) .eut(8) - .addTo(sBenderRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.IC2_Food_Can_Empty.get(1L)) - .duration(20 * TICKS) - .eut((int) TierEU.RECIPE_HV) - .addTo(sBenderRecipes); + .addTo(benderRecipes); + + if (GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.IC2_Food_Can_Empty.get(1L)) + .duration(20 * TICKS) + .eut((int) TierEU.RECIPE_HV) + .addTo(benderRecipes); + } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index b20ccf7040..5da5192dfd 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -3,9 +3,9 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.GTNHLanthanides; import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; +import static gregtech.api.recipe.RecipeMaps.primitiveBlastRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBlastRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -43,7 +43,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_HV) .metadata(COIL_HEAT, 3200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); // Carbothermic Reduction // Depend on real amount except real ores @@ -56,7 +56,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.RoastedAntimony.getDust(2), Materials.Carbon.getDust(1)) @@ -65,7 +65,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.RoastedIron.getDust(2), Materials.Carbon.getDust(1)) @@ -74,7 +74,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.RoastedNickel.getDust(2), Materials.Carbon.getDust(1)) @@ -83,7 +83,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.RoastedZinc.getDust(2), Materials.Carbon.getDust(1)) @@ -92,7 +92,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.RoastedCobalt.getDust(2), Materials.Carbon.getDust(1)) @@ -101,7 +101,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.RoastedArsenic.getDust(2), Materials.Carbon.getDust(1)) @@ -110,7 +110,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.RoastedLead.getDust(2), Materials.Carbon.getDust(1)) @@ -119,7 +119,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Malachite.getDust(2), Materials.Carbon.getDust(1)) @@ -128,7 +128,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Magnetite.getDust(2), Materials.Carbon.getDust(1)) @@ -137,7 +137,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.YellowLimonite.getDust(2), Materials.Carbon.getDust(1)) @@ -146,7 +146,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.BrownLimonite.getDust(2), Materials.Carbon.getDust(1)) @@ -155,7 +155,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.BasalticMineralSand.getDust(2), Materials.Carbon.getDust(1)) @@ -164,7 +164,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.GraniticMineralSand.getDust(2), Materials.Carbon.getDust(1)) @@ -173,7 +173,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Cassiterite.getDust(2), Materials.Carbon.getDust(1)) @@ -182,7 +182,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.CassiteriteSand.getDust(2), Materials.Carbon.getDust(1)) @@ -191,7 +191,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.SiliconDioxide.getDust(3), Materials.Carbon.getDust(2)) @@ -200,7 +200,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(4 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { GT_Values.RA.stdBuilder() @@ -210,7 +210,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Malachite.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -219,7 +219,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.AntimonyTrioxide.getDust(5), Materials.Carbon.getDustSmall(4)) @@ -228,7 +228,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.BandedIron.getDust(5), Materials.Carbon.getDustSmall(4)) @@ -237,7 +237,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Magnetite.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -246,7 +246,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.YellowLimonite.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -255,7 +255,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.BrownLimonite.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -264,7 +264,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.BasalticMineralSand.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -273,7 +273,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.GraniticMineralSand.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -282,7 +282,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Cassiterite.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -291,7 +291,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.CassiteriteSand.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -300,7 +300,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Garnierite.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -309,7 +309,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.CobaltOxide.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -318,7 +318,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.ArsenicTrioxide.getDust(5), Materials.Carbon.getDustSmall(4)) @@ -327,7 +327,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Massicot.getDust(2), Materials.Carbon.getDustSmall(4)) @@ -336,7 +336,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); } GT_Values.RA.stdBuilder() @@ -348,7 +348,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(7 * MINUTES + 30 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1784) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -361,7 +361,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(10 * MINUTES) .eut((int) TierEU.RECIPE_HV) .metadata(COIL_HEAT, 2484) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -374,7 +374,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(12 * MINUTES + 30 * SECONDS) .eut((int) TierEU.RECIPE_EV) .metadata(COIL_HEAT, 4484) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -387,7 +387,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(15 * MINUTES) .eut((int) TierEU.RECIPE_IV) .metadata(COIL_HEAT, 6484) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -400,7 +400,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(17 * MINUTES + 30 * SECONDS) .eut((int) TierEU.RECIPE_LuV) .metadata(COIL_HEAT, 9000) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); // CaH2 + 2Si = CaSi2 + 2H @@ -413,7 +413,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(15 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1273) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -423,7 +423,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(16 * MINUTES + 23 * SECONDS) .eut((int) TierEU.RECIPE_UV) .metadata(COIL_HEAT, 11800) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -434,7 +434,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS) .eut((int) TierEU.RECIPE_UV) .metadata(COIL_HEAT, 11800) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); // 0.45 * 19660 = 8847 @@ -446,7 +446,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(16 * MINUTES + 23 * SECONDS) .eut((int) TierEU.RECIPE_UHV) .metadata(COIL_HEAT, 12700) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -457,7 +457,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS) .eut((int) TierEU.RECIPE_UHV) .metadata(COIL_HEAT, 12700) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); // 0.45 * 19660 = 8847 @@ -469,7 +469,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(16 * MINUTES + 23 * SECONDS) .eut((int) TierEU.RECIPE_UEV) .metadata(COIL_HEAT, 13600) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -480,7 +480,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS) .eut((int) TierEU.RECIPE_UEV) .metadata(COIL_HEAT, 13600) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); // 0.45 * 19660 = 8847 // CaO + 3C = CaC2 + CO @@ -492,7 +492,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(30 * SECONDS) .eut((int) TierEU.RECIPE_HV) .metadata(COIL_HEAT, 2573) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); // Ni + 3Al = NiAl3 @@ -502,7 +502,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(45 * SECONDS) .eut((int) TierEU.RECIPE_HV) .metadata(COIL_HEAT, 1688) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); ItemStack[] tSiliconDioxide = new ItemStack[] { Materials.SiliconDioxide.getDust(3), Materials.NetherQuartz.getDust(3), Materials.CertusQuartz.getDust(3), Materials.Quartzite.getDust(6) }; @@ -518,7 +518,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(6 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); } GT_Values.RA.stdBuilder() @@ -529,7 +529,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(6 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Pyrite.getDust(1)) .itemOutputs(Materials.RoastedIron.getDust(1), Materials.Ash.getDustTiny(1)) @@ -538,7 +538,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(6 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Pentlandite.getDust(1)) .itemOutputs(Materials.RoastedNickel.getDust(1), Materials.Ash.getDustTiny(1)) @@ -547,7 +547,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(6 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Sphalerite.getDust(1)) .itemOutputs(Materials.RoastedZinc.getDust(1), Materials.Ash.getDustTiny(1)) @@ -556,7 +556,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(6 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Cobaltite.getDust(1)) .itemOutputs(Materials.RoastedCobalt.getDust(1), Materials.RoastedArsenic.getDust(1)) @@ -565,7 +565,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(6 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Stibnite.getDust(1)) .itemOutputs(Materials.RoastedAntimony.getDust(1), Materials.Ash.getDustTiny(1)) @@ -574,7 +574,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(6 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Galena.getDust(1)) .itemOutputs(Materials.RoastedLead.getDust(1), Materials.Ash.getDustTiny(1)) @@ -583,7 +583,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(6 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1200) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) { @@ -595,7 +595,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(3 * MINUTES) .eut(32000000) .metadata(COIL_HEAT, 11701) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); // Rh + 3Cl = RhCl3 @@ -608,7 +608,7 @@ public class BlastFurnaceRecipes implements Runnable { .duration(30 * SECONDS) .eut((int) TierEU.RECIPE_HV) .metadata(COIL_HEAT, 573) - .addTo(sBlastRecipes); + .addTo(blastFurnaceRecipes); } } @@ -617,32 +617,28 @@ public class BlastFurnaceRecipes implements Runnable { .itemInputs(Materials.Iron.getIngots(1)) .itemOutputs(Materials.Steel.getIngots(1)) .duration(6 * MINUTES) - .eut(0) .metadata(ADDITIVE_AMOUNT, 4) - .addTo(sPrimitiveBlastRecipes); + .addTo(primitiveBlastRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Iron.getDust(1)) .itemOutputs(Materials.Steel.getIngots(1)) .duration(6 * MINUTES) - .eut(0) .metadata(ADDITIVE_AMOUNT, 4) - .addTo(sPrimitiveBlastRecipes); + .addTo(primitiveBlastRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Iron.getBlocks(1)) .itemOutputs(Materials.Steel.getIngots(9)) .duration(54 * MINUTES) - .eut(0) .metadata(ADDITIVE_AMOUNT, 36) - .addTo(sPrimitiveBlastRecipes); + .addTo(primitiveBlastRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Steel.getDust(1)) .itemOutputs(Materials.Steel.getIngots(1)) .duration(6 * MINUTES) - .eut(0) .metadata(ADDITIVE_AMOUNT, 2) - .addTo(sPrimitiveBlastRecipes); + .addTo(primitiveBlastRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java index a188a9b420..e5972f4e77 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java @@ -2,8 +2,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.recipe.RecipeMaps.brewingRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBrewingRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; @@ -39,7 +39,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("lubricant", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); // seed oil to lubricant recipes GT_Values.RA.stdBuilder() @@ -48,7 +48,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("lubricant", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); // lubricant recipes { @@ -58,7 +58,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("lubricant", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(item) @@ -66,7 +66,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("lubricant", 500)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(item) @@ -74,7 +74,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("lubricant", 500)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(item) @@ -82,7 +82,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("lubricant", 750)) .duration(3 * SECONDS + 4 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } } @@ -107,7 +107,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("milk", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L)) @@ -115,7 +115,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.wheatyjuice", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L)) @@ -123,7 +123,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mineralwater", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L)) @@ -131,7 +131,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mineralwater", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L)) @@ -139,7 +139,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mineralwater", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L)) @@ -147,7 +147,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mineralwater", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L)) @@ -155,7 +155,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.thick", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)) @@ -163,7 +163,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) @@ -171,7 +171,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L)) @@ -179,7 +179,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.magma_cream, 1, 0)) @@ -187,7 +187,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0)) @@ -195,7 +195,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.spider_eye, 1, 0)) @@ -203,7 +203,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.speckled_melon, 1, 0)) @@ -211,7 +211,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.ghast_tear, 1, 0)) @@ -219,7 +219,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.nether_wart, 1, 0)) @@ -227,7 +227,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.awkward", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 0)) @@ -235,7 +235,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.poison", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fish, 1, 3)) @@ -244,7 +244,7 @@ public class BreweryRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(4) .hidden() - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Grin_Powder.get(1L)) @@ -252,7 +252,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.poison.strong", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.reeds, 1, 0)) @@ -260,7 +260,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.reedwater", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.apple, 1, 0)) @@ -268,7 +268,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.applejuice", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.golden_apple, 1, 0)) @@ -277,7 +277,7 @@ public class BreweryRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(4) .hidden() - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.golden_apple, 1, 1)) @@ -286,7 +286,7 @@ public class BreweryRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(4) .hidden() - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Hops.get(1L)) @@ -294,7 +294,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.hopsjuice", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) @@ -302,7 +302,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.darkcoffee", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) @@ -310,7 +310,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.chillysauce", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } } @@ -323,7 +323,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.hotsauce", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) @@ -332,7 +332,7 @@ public class BreweryRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(4) .hidden() - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) @@ -341,7 +341,7 @@ public class BreweryRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(4) .hidden() - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) @@ -349,7 +349,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.coffee", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) @@ -357,7 +357,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.darkchocolatemilk", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Hops.get(1L)) @@ -365,7 +365,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.wheatyhopsjuice", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L)) @@ -373,7 +373,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.wheatyhopsjuice", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) @@ -382,7 +382,7 @@ public class BreweryRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(4) .hidden() - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) @@ -390,7 +390,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.cafeaulait", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) @@ -399,7 +399,7 @@ public class BreweryRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(4) .hidden() - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) @@ -407,7 +407,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.lemonade", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) @@ -416,7 +416,7 @@ public class BreweryRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(4) .hidden() - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) @@ -424,7 +424,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.chocolatemilk", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L)) @@ -432,7 +432,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.icetea", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L)) @@ -441,7 +441,7 @@ public class BreweryRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(4) .hidden() - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) @@ -450,7 +450,7 @@ public class BreweryRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(4) .hidden() - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0)) @@ -458,7 +458,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.weakness", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0)) @@ -466,7 +466,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.weakness", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } // biomass recipes @@ -477,7 +477,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("biomass", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Forestry.ID, "mulch", 16L, 0)) @@ -485,7 +485,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("biomass", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Forestry.ID, "mulch", 8L, 0)) @@ -493,7 +493,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("biomass", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } // ic2 biomass recipes @@ -504,7 +504,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("ic2biomass", 1000)) .duration(8 * SECONDS + 10 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); // Would add 2 different amount of water input if IC2 isn't loaded if (IndustrialCraft2.isModLoaded()) { @@ -514,7 +514,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("ic2biomass", 1000)) .duration(10 * TICKS) .eut((int) TierEU.RECIPE_LV) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } } @@ -540,7 +540,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion." + aName, 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); // strong if (aName.equals("regen") || aName.equals("speed") @@ -553,7 +553,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion." + aName + ".strong", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } // long @@ -564,7 +564,7 @@ public class BreweryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion." + aName + ".long", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sBrewingRecipes); + .addTo(brewingRecipes); } MixerRecipes.addMixerPotionRecipes(aName); diff --git a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java index 0ad5ed23a8..aef837a6b3 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes; +import static gregtech.api.recipe.RecipeMaps.cannerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -27,7 +27,7 @@ public class CannerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("reactorLithiumCell", 1, 1)) .duration(16 * TICKS) .eut(64) - .addTo(sCannerRecipes); + .addTo(cannerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -36,21 +36,21 @@ public class CannerRecipes implements Runnable { .itemOutputs(ItemList.ThoriumCell_1.get(1L)) .duration(1 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sCannerRecipes); + .addTo(cannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("UranFuel", 1)) .itemOutputs(ItemList.Uraniumcell_1.get(1)) .duration(1 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sCannerRecipes); + .addTo(cannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("MOXFuel", 1)) .itemOutputs(ItemList.Moxcell_1.get(1)) .duration(1 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sCannerRecipes); + .addTo(cannerRecipes); } GT_Values.RA.stdBuilder() @@ -60,7 +60,7 @@ public class CannerRecipes implements Runnable { .itemOutputs(ItemList.NaquadahCell_1.get(1L)) .duration(1 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sCannerRecipes); + .addTo(cannerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -69,6 +69,6 @@ public class CannerRecipes implements Runnable { .itemOutputs(ItemList.MNqCell_1.get(1L)) .duration(1 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sCannerRecipes); + .addTo(cannerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java index 877d52f3f4..b9375ebb1d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java @@ -6,8 +6,8 @@ import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.ThaumicTinkerer; import static gregtech.api.enums.Mods.TwilightForest; +import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -42,7 +42,7 @@ public class CentrifugeRecipes implements Runnable { .fluidInputs(Materials.Mercury.getFluid(200)) .duration(20 * SECONDS) .eut((int) TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Cell_Empty.get(1)) @@ -51,7 +51,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Nitrogen.getGas(3900)) .duration(1 * MINUTES + 20 * SECONDS) .eut(8) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 9)) @@ -65,7 +65,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(10000, 10000, 10000, 9500, 9000, 8500) .duration(6 * MINUTES + 45 * SECONDS) .eut(30) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemOutputs( @@ -80,7 +80,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(500)) .duration(2 * SECONDS) .eut((int) TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // food ->CH4 @@ -90,7 +90,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Methane.getGas(4608)) .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.golden_apple, 1, 0), GT_Utility.getIntegratedCircuit(1)) @@ -98,7 +98,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Methane.getGas(576)) .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.golden_carrot, 1, 0), GT_Utility.getIntegratedCircuit(1)) @@ -106,7 +106,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Methane.getGas(576)) .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.speckled_melon, 1, 0), GT_Utility.getIntegratedCircuit(1)) @@ -114,7 +114,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Methane.getGas(576)) .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.mushroom_stew, 16, 0), GT_Utility.getIntegratedCircuit(1)) @@ -122,203 +122,203 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.apple, 32, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.bread, 64, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.porkchop, 12, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.cooked_porkchop, 16, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.beef, 12, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.cooked_beef, 16, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fish, 12, 32767), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.cooked_fished, 16, 32767), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.chicken, 12, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.cooked_chicken, 16, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.melon, 64, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.pumpkin, 16, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.rotten_flesh, 16, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.spider_eye, 32, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.carrot, 16, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Raw_Potato.get(16), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Poisonous_Potato.get(12), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Baked_Potato.get(24), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.cookie, 64, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.cake, 8, 0), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.brown_mushroom_block, 12, 32767), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.red_mushroom_block, 12, 32767), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.brown_mushroom, 32, 32767), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.red_mushroom, 32, 32767), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.nether_wart, 32, 32767), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("terraWart", 16), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(TwilightForest.ID, "item.meefRaw", 12L, 32767), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(TwilightForest.ID, "item.meefSteak", 16L, 32767), GT_Utility.getIntegratedCircuit(1)) .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -327,7 +327,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -336,7 +336,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Methane.getGas(576)) .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -345,7 +345,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Methane.getGas(60)) .duration(10 * SECONDS) .eut(20) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.sand, 1, 1)) @@ -356,7 +356,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(5000, 100, 5000) .duration(30 * SECONDS) .eut((int) TierEU.RECIPE_MV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.dirt, 1, 32767)) @@ -367,7 +367,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(1250, 5000, 5000) .duration(12 * SECONDS + 10 * TICKS) .eut(30) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.grass, 1, 32767)) @@ -378,7 +378,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(2500, 5000, 5000) .duration(12 * SECONDS + 10 * TICKS) .eut(30) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.mycelium, 1, 32767)) @@ -390,7 +390,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(2500, 2500, 5000, 5000) .duration(32 * SECONDS + 10 * TICKS) .eut(30) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Resin.get(1)) @@ -401,7 +401,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Glue.getFluid(100)) .duration(15 * SECONDS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -413,7 +413,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(1000, 500) .duration(1 * MINUTES + 40 * SECONDS) .eut((int) TierEU.RECIPE_HV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // Uranium Enrichment in Centrifuge by adding Fluorine (Uranium Hexafluoride) @@ -424,7 +424,7 @@ public class CentrifugeRecipes implements Runnable { .fluidInputs(Materials.Fluorine.getGas(4000)) .duration(3 * MINUTES + 20 * SECONDS) .eut((int) TierEU.RECIPE_EV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1)) @@ -434,7 +434,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(2000, 3000) .duration(1 * MINUTES + 20 * SECONDS) .eut(320) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 9)) @@ -444,7 +444,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(5000, 1000) .duration(24 * MINUTES) .eut(320) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 4)) @@ -454,28 +454,28 @@ public class CentrifugeRecipes implements Runnable { .outputChances(2000, 3000) .duration(21 * MINUTES + 20 * SECONDS) .eut(640) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .fluidInputs(Materials.Hydrogen.getGas(160)) .fluidOutputs(Materials.Deuterium.getGas(40)) .duration(8 * SECONDS) .eut(20) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .fluidInputs(Materials.Deuterium.getGas(160)) .fluidOutputs(Materials.Tritium.getGas(40)) .duration(8 * SECONDS) .eut(80) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .fluidInputs(Materials.Helium.getGas(80)) .fluidOutputs(Materials.Helium_3.getGas(5)) .duration(8 * SECONDS) .eut(80) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 2)) @@ -484,7 +484,7 @@ public class CentrifugeRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1)) .duration(48 * SECONDS + 16 * TICKS) .eut(80) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 36)) @@ -496,7 +496,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Helium.getGas(4320)) .duration(9 * MINUTES + 36 * SECONDS) .eut(20) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 36)) @@ -508,7 +508,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(5625, 9900, 5625, 2500) .duration(4 * MINUTES + 48 * SECONDS) .eut(20) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(10)) @@ -523,7 +523,7 @@ public class CentrifugeRecipes implements Runnable { .fluidInputs(Materials.Lava.getFluid(400)) .duration(16 * SECONDS) .eut(80) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(20)) @@ -538,7 +538,7 @@ public class CentrifugeRecipes implements Runnable { .fluidInputs(Materials.Lava.getFluid(3600)) .duration(2 * MINUTES + 24 * SECONDS) .eut(80) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.soul_sand, 1)) @@ -550,7 +550,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.Oil.getFluid(200)) .duration(10 * SECONDS) .eut(12) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(10)) @@ -565,7 +565,7 @@ public class CentrifugeRecipes implements Runnable { .fluidInputs(getFluidStack("ic2pahoehoelava", 100)) .duration(2 * SECONDS) .eut(1024) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(20)) @@ -580,23 +580,7 @@ public class CentrifugeRecipes implements Runnable { .fluidInputs(getFluidStack("ic2pahoehoelava", 3600)) .duration(16 * SECONDS + 8 * TICKS) .eut(4096) - .addTo(sCentrifugeRecipes); - - // rare earth ( why this still remain - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Yttrium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lanthanum, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cerium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cadmium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Caesium, 1)) - .outputChances(2500, 2500, 2500, 2500, 2500, 2500) - .duration(3 * SECONDS + 4 * TICKS) - .eut(20) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -612,7 +596,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(2000, 2000, 2000, 2000, 2000, 2000) .duration(3 * SECONDS + 4 * TICKS) .eut(20) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -628,7 +612,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(9000, 9000, 9000, 9000, 9000, 9000) .duration(25 * SECONDS + 18 * TICKS) .eut(80) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // Ash centrifuge recipes @@ -644,7 +628,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(6400, 6000, 4500, 10000, 10000, 10000) .duration(5 * MINUTES) .eut(30) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // Stone Dust and Metal Mixture centrifuge recipes @@ -660,7 +644,7 @@ public class CentrifugeRecipes implements Runnable { .outputChances(10000, 10000, 10000, 10000, 10000, 10000) .duration(7 * MINUTES + 12 * SECONDS) .eut(30) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.MetalMixture.getDust(36)) @@ -674,21 +658,21 @@ public class CentrifugeRecipes implements Runnable { .outputChances(10000, 10000, 10000, 10000, 10000, 10000) .duration(10 * MINUTES + 56 * SECONDS + 5 * TICKS) .eut((int) TierEU.RECIPE_EV) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .fluidInputs(Materials.Propane.getGas(320)) .fluidOutputs(Materials.LPG.getFluid(290)) .duration(20 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .fluidInputs(Materials.Butane.getGas(320)) .fluidOutputs(Materials.LPG.getFluid(370)) .duration(20 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemOutputs( @@ -699,7 +683,7 @@ public class CentrifugeRecipes implements Runnable { .fluidOutputs(Materials.FluidNaquadahFuel.getFluid(4806)) .duration(30 * SECONDS) .eut(2000000) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) @@ -708,14 +692,14 @@ public class CentrifugeRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1)) .duration(12 * SECONDS + 10 * TICKS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.magma_cream, 1)) .itemOutputs(new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.slime_ball, 1)) .duration(25 * SECONDS) .eut(5) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); if (Thaumcraft.isModLoaded()) { // air @@ -725,7 +709,7 @@ public class CentrifugeRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // fire @@ -734,7 +718,7 @@ public class CentrifugeRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // aqua @@ -743,7 +727,7 @@ public class CentrifugeRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // terra @@ -752,7 +736,7 @@ public class CentrifugeRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // ordo @@ -761,7 +745,7 @@ public class CentrifugeRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // perditio @@ -770,7 +754,7 @@ public class CentrifugeRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // Nethershard @@ -779,7 +763,7 @@ public class CentrifugeRecipes implements Runnable { .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6)) .duration(6 * SECONDS + 8 * TICKS) .eut(512) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // Endshard @@ -788,7 +772,7 @@ public class CentrifugeRecipes implements Runnable { .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7)) .duration(6 * SECONDS + 8 * TICKS) .eut(512) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); } if (ExtraUtilities.isModLoaded()) { @@ -805,7 +789,7 @@ public class CentrifugeRecipes implements Runnable { getModItem(ExtraUtilities.ID, "greenscreen", 1L, 6)) .duration(25 * SECONDS + 12 * TICKS) .eut(12) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // Caelestis green @@ -819,7 +803,7 @@ public class CentrifugeRecipes implements Runnable { getModItem(ExtraUtilities.ID, "greenscreen", 1L, 0)) .duration(25 * SECONDS + 12 * TICKS) .eut(12) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); // Caelestis blue @@ -833,7 +817,7 @@ public class CentrifugeRecipes implements Runnable { getModItem(ExtraUtilities.ID, "greenscreen", 1L, 15)) .duration(25 * SECONDS + 12 * TICKS) .eut(12) - .addTo(sCentrifugeRecipes); + .addTo(centrifugeRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java index d05c709802..8ca67db192 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java @@ -1,8 +1,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.BuildCraftTransport; +import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -32,7 +32,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.FryingOilHot.getFluid(10)) .duration(16 * TICKS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("dynamite", 1)) @@ -40,7 +40,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Glue.getFluid(10)) .duration(16 * TICKS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1)) @@ -48,7 +48,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Concrete.getMolten(144)) .duration(10 * SECONDS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1)) @@ -56,7 +56,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(125)) .duration(12 * TICKS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); // paper creation recipes ItemStack[] paperSources = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), @@ -68,7 +68,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(paperSource) @@ -76,7 +76,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(100)) .duration(10 * SECONDS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } GT_Values.RA.stdBuilder() @@ -85,7 +85,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(125)) .duration(12 * TICKS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); for (int i = 1; i < 16; i++) { // wool cleaning recipes @@ -95,7 +95,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Chlorine.getGas(50)) .duration(20 * SECONDS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); // carpet cleaning recipes GT_Values.RA.stdBuilder() @@ -104,7 +104,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Chlorine.getGas(25)) .duration(20 * SECONDS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } // stained hardened clay cleaning @@ -114,7 +114,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Chlorine.getGas(50)) .duration(20 * SECONDS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); // stained glass cleaning GT_Values.RA.stdBuilder() @@ -123,7 +123,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Chlorine.getGas(50)) .duration(20 * SECONDS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); // stained glass pane cleaning GT_Values.RA.stdBuilder() @@ -132,7 +132,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Chlorine.getGas(20)) .duration(20 * SECONDS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); // light -> dark concrete recipes for (int i = 0; i < 8; i++) { @@ -142,7 +142,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(250)) .duration(10 * SECONDS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i + 8)) @@ -150,7 +150,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(250)) .duration(10 * SECONDS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } // reinforced blocks @@ -161,7 +161,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Concrete.getMolten(144)) .duration(10 * SECONDS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1)) @@ -169,7 +169,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Steel.getMolten(288)) .duration(12 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1)) @@ -177,7 +177,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Titanium.getMolten(144)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) @@ -185,7 +185,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.TungstenSteel.getMolten(144)) .duration(17 * SECONDS + 10 * TICKS) .eut(64) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1)) @@ -193,7 +193,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Iridium.getMolten(144)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1)) @@ -201,7 +201,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Osmium.getMolten(144)) .duration(22 * SECONDS + 10 * TICKS) .eut(256) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1)) @@ -209,7 +209,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Naquadria.getMolten(144)) .duration(25 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) @@ -217,7 +217,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Concrete.getMolten(144)) .duration(10 * SECONDS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } for (int j = 0; j < Dyes.dyeRed.getSizeOfFluidList(); j++) { @@ -227,7 +227,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Dyes.dyeRed.getFluidDye(j, 72)) .duration(1 * SECONDS + 12 * TICKS) .eut(16) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } for (int j = 0; j < Dyes.dyeBlue.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() @@ -236,7 +236,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Dyes.dyeBlue.getFluidDye(j, 72)) .duration(1 * SECONDS + 12 * TICKS) .eut(16) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } for (int j = 0; j < Dyes.dyeGreen.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() @@ -245,7 +245,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Dyes.dyeGreen.getFluidDye(j, 72)) .duration(1 * SECONDS + 12 * TICKS) .eut(16) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } for (int j = 0; j < Dyes.dyeYellow.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() @@ -254,7 +254,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Dyes.dyeYellow.getFluidDye(j, 72)) .duration(1 * SECONDS + 12 * TICKS) .eut(16) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } for (byte i = 0; i < 16; i = (byte) (i + 1)) { for (int j = 0; j < Dyes.VALUES[i].getSizeOfFluidList(); j++) { @@ -265,7 +265,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 72)) .duration(3 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } GT_Values.RA.stdBuilder() @@ -274,7 +274,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 18)) .duration(3 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.hardened_clay, 1, 0)) @@ -282,7 +282,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 18)) .duration(3 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } } @@ -293,7 +293,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Radon.getGas(250)) .duration(24 * SECONDS) .eut(384) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1)) @@ -301,7 +301,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.Radon.getGas(1250)) .duration(1 * MINUTES + 36 * SECONDS) .eut(384) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.WovenKevlar.get(1)) @@ -309,7 +309,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(MaterialsKevlar.PolyurethaneResin.getFluid(1000)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); // Na + H2O = NaOH + H GT_Values.RA.stdBuilder() @@ -319,7 +319,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidOutputs(Materials.Hydrogen.getGas(1000)) .duration(5 * SECONDS) .eut(4) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); // Custom Sodium Persulfate Ore Processing Recipes @@ -333,7 +333,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.SodiumPersulfate.getFluid(100)) .duration(40 * SECONDS) .eut(8) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Pyrolusite, 1)) .itemOutputs( @@ -344,7 +344,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.SodiumPersulfate.getFluid(100)) .duration(40 * SECONDS) .eut(8) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Quartzite, 1)) .itemOutputs( @@ -355,7 +355,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.SodiumPersulfate.getFluid(100)) .duration(40 * SECONDS) .eut(8) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.CertusQuartz, 1)) .itemOutputs( @@ -366,7 +366,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.SodiumPersulfate.getFluid(100)) .duration(40 * SECONDS) .eut(8) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bauxite, 1)) .itemOutputs( @@ -377,7 +377,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.SodiumPersulfate.getFluid(100)) .duration(40 * SECONDS) .eut(8) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Thorium, 1)) .itemOutputs( @@ -388,7 +388,7 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.SodiumPersulfate.getFluid(100)) .duration(40 * SECONDS) .eut(8) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Stibnite, 1)) .itemOutputs( @@ -399,6 +399,6 @@ public class ChemicalBathRecipes implements Runnable { .fluidInputs(Materials.SodiumPersulfate.getFluid(100)) .duration(40 * SECONDS) .eut(8) - .addTo(sChemicalBathRecipes); + .addTo(chemicalBathRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index e914ab214c..285781996f 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -6,9 +6,9 @@ import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes; +import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -196,7 +196,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HydricSulfide.getGas(125)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -220,7 +220,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HydricSulfide.getGas(125)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -244,7 +244,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HydricSulfide.getGas(250)) .duration(2 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -268,7 +268,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HydricSulfide.getGas(250)) .duration(2 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -292,7 +292,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HydricSulfide.getGas(125)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -690,7 +690,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Titaniumtetrachloride.getFluid(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -700,7 +700,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Titaniumtetrachloride.getFluid(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -710,7 +710,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.CarbonMonoxide.getGas(2000), Materials.Titaniumtetrachloride.getFluid(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 4Na + 2MgCl2 = 2Mg + 4NaCl @@ -3850,7 +3850,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(aPolymer, 3240)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -3861,7 +3861,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(aPolymer, 4320)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); } @@ -3899,7 +3899,7 @@ public class ChemicalRecipes implements Runnable { .itemOutputs(Materials.GasolineRegular.getCells(11)) .duration(10 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Benzene.getCells(1), Materials.Empty.getCells(1)) @@ -3908,7 +3908,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Styrene.getFluid(1000)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Ethylene.getCells(1), Materials.Empty.getCells(1)) @@ -3917,7 +3917,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Styrene.getFluid(1000)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Methane.getCells(1), Materials.Empty.getCells(2)) @@ -3926,7 +3926,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Chloroform.getFluid(1000)) .duration(4 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Silicon.getDust(1), Materials.Chloromethane.getCells(2)) @@ -3934,7 +3934,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Dimethyldichlorosilane.getFluid(1000)) .duration(12 * SECONDS) .eut(96) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), Materials.Water.getCells(1)) @@ -3942,7 +3942,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)) .duration(12 * SECONDS) .eut(96) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // Ca5(PO4)3Cl + 5H2SO4 + 10H2O = 5CaSO4(H2O)2 + HCl + 3H3PO4 @@ -3953,7 +3953,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.PhosphoricAcid.getFluid(3000)) .duration(16 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // 10O + 4P = P4O10 @@ -3963,7 +3963,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Oxygen.getGas(10000)) .duration(2 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // HCl + C3H8O3 = C3H5ClO + 2H2O @@ -3973,7 +3973,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)) .duration(24 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // H2O + Cl =Hg= HClO + H @@ -3984,7 +3984,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HypochlorousAcid.getFluid(10000)) .duration(30 * SECONDS) .eut(8) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Water.getCells(10), Materials.Mercury.getCells(1)) @@ -3993,7 +3993,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HypochlorousAcid.getFluid(10000)) .duration(30 * SECONDS) .eut(8) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Chlorine.getCells(1), Materials.Water.getCells(1)) @@ -4002,7 +4002,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HypochlorousAcid.getFluid(1000)) .duration(3 * SECONDS) .eut(8) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // P + 3Cl = PCl3 @@ -4012,7 +4012,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4023,7 +4023,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4034,7 +4034,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4045,14 +4045,14 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.Ethyleneglycol.getFluid(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), MaterialsKevlar.NaphthenicAcid.getCells(1)) .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41), ItemList.Cell_Empty.get(1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), MaterialsKevlar.NaphthenicAcid.getCells(1)) @@ -4060,7 +4060,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.AceticAcid.getFluid(1500)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4070,7 +4070,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.SiliconTetrachloride.getFluid(1000)) .duration(20 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4080,7 +4080,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 8000)) .duration(3 * SECONDS) .eut(150) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Carbon.getDust(1), Materials.Empty.getCells(1)) @@ -4088,7 +4088,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Hydrogen.getGas(4000)) .duration(10 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // O + 2H = H2O @@ -4101,7 +4101,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(GT_ModHandler.getDistilledWater(1000)) .duration(10 * TICKS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4112,7 +4112,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(GT_ModHandler.getDistilledWater(500)) .duration(5 * TICKS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // Si + 4Cl = SiCl4 @@ -4123,7 +4123,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Trichlorosilane.getFluid(1000)) .duration(15 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4133,7 +4133,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Hydrogen.getGas(4000)) .duration(15 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1), ItemList.Cell_Empty.get(3)) @@ -4142,7 +4142,7 @@ public class ChemicalRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 4)) .duration(15 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // S + 2Cl = SCl2 @@ -4155,7 +4155,7 @@ public class ChemicalRecipes implements Runnable { ItemList.Cell_Empty.get(8)) .duration(40 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8), ItemList.Cell_Empty.get(8)) @@ -4163,7 +4163,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Chlorine.getGas(16000)) .duration(40 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // C6H6 + C3H6 = C9H12 @@ -4174,7 +4174,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Cumene.getFluid(8000)) .duration(1 * MINUTES + 36 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.PhosphoricAcid.getCells(1), Materials.Benzene.getCells(8)) @@ -4183,7 +4183,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Cumene.getFluid(8000)) .duration(1 * MINUTES + 36 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Benzene.getCells(1), Materials.Propene.getCells(1)) @@ -4192,7 +4192,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Cumene.getFluid(1000)) .duration(12 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // C3H6O + 2C6H6O =HCl= C15H16O2 + H2O @@ -4203,7 +4203,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.BisphenolA.getFluid(1000)) .duration(8 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Acetone.getCells(1)) @@ -4212,7 +4212,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.BisphenolA.getFluid(1000)) .duration(8 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Phenol.getCells(2), Materials.HydrochloricAcid.getCells(1)) @@ -4221,7 +4221,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.BisphenolA.getFluid(1000)) .duration(8 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // N + 3H = NH3 @@ -4232,7 +4232,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Ammonia.getGas(1000)) .duration(16 * SECONDS) .eut(TierEU.HV * 3 / 4) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Hydrogen.getCells(3), GT_Utility.getIntegratedCircuit(1)) @@ -4241,7 +4241,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Ammonia.getGas(1000)) .duration(16 * SECONDS) .eut(TierEU.HV * 3 / 4) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Nitrogen.getCells(1), GT_Utility.getIntegratedCircuit(11)) @@ -4249,7 +4249,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Hydrogen.getGas(3000)) .duration(16 * SECONDS) .eut(TierEU.HV * 3 / 4) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Hydrogen.getCells(3), GT_Utility.getIntegratedCircuit(11)) @@ -4257,7 +4257,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Nitrogen.getGas(1000)) .duration(16 * SECONDS) .eut(TierEU.HV * 3 / 4) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Ammonia.getCells(1), Materials.Empty.getCells(1)) @@ -4266,7 +4266,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Dimethylamine.getGas(1000)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Ammonia.getCells(4), Materials.Empty.getCells(2)) @@ -4275,7 +4275,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricOxide.getGas(4000)) .duration(16 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) @@ -4284,7 +4284,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricOxide.getGas(1000)) .duration(12 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // 2NO2 + O + H2O = 2HNO3 @@ -4295,7 +4295,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricAcid.getFluid(2000)) .duration(12 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Oxygen.getCells(1), Materials.Water.getCells(1)) @@ -4304,7 +4304,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricAcid.getFluid(2000)) .duration(12 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Water.getCells(1), Materials.NitrogenDioxide.getCells(2)) @@ -4313,7 +4313,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricAcid.getFluid(2000)) .duration(12 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Sulfur.getDust(1), Materials.Empty.getCells(1)) @@ -4321,7 +4321,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Hydrogen.getGas(2000)) .duration(3 * SECONDS) .eut(8) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // C2H4 + HCl + O = C2H3Cl + H2O @@ -4332,7 +4332,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.VinylChloride.getGas(1000)) .duration(8 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Oxygen.getCells(1)) @@ -4341,7 +4341,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.VinylChloride.getGas(1000)) .duration(8 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Oxygen.getCells(1), Materials.Ethylene.getCells(1)) @@ -4350,7 +4350,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.VinylChloride.getGas(1000)) .duration(8 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Butadiene.getCells(1), ItemList.Cell_Air.get(5)) @@ -4358,7 +4358,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Styrene.getFluid(350)) .duration(8 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Butadiene.getCells(1), Materials.Oxygen.getCells(5)) @@ -4366,7 +4366,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Styrene.getFluid(350)) .duration(8 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Styrene.getCells(1), ItemList.Cell_Air.get(15)) @@ -4374,7 +4374,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Butadiene.getGas(3000)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Styrene.getCells(1), Materials.Oxygen.getCells(15)) @@ -4382,7 +4382,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Butadiene.getGas(3000)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Styrene.getCells(1), Materials.Butadiene.getCells(3)) @@ -4390,7 +4390,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Air.getGas(15000)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Styrene.getCells(1), Materials.Butadiene.getCells(3)) @@ -4398,7 +4398,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Oxygen.getGas(15000)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Benzene.getCells(1), Materials.Empty.getCells(1)) @@ -4407,7 +4407,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Dichlorobenzene.getFluid(1000)) .duration(12 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Glycerol.getCells(1), Materials.Empty.getCells(2)) @@ -4416,7 +4416,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Glyceryl.getFluid(1000)) .duration(9 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.SodiumHydroxide.getDust(12), Materials.Empty.getCells(4)) @@ -4424,14 +4424,14 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Chlorobenzene.getFluid(4000)) .duration(48 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.SodiumHydroxide.getDust(12), Materials.Chlorobenzene.getCells(4)) .itemOutputs(Materials.Salt.getDust(8), Materials.Phenol.getCells(4)) .duration(48 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // Recipes for gasoline // 2N + O = N2O @@ -4441,7 +4441,7 @@ public class ChemicalRecipes implements Runnable { .itemOutputs(Materials.NitrousOxide.getCells(1), Materials.Empty.getCells(2)) .duration(10 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Nitrogen.getCells(2), GT_Utility.getIntegratedCircuit(1)) @@ -4450,7 +4450,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitrousOxide.getGas(1000)) .duration(10 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Nitrogen.getCells(2), GT_Utility.getIntegratedCircuit(11)) @@ -4458,7 +4458,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Oxygen.getGas(1000)) .duration(10 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1)) @@ -4467,7 +4467,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitrousOxide.getGas(1000)) .duration(10 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(11)) @@ -4475,7 +4475,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Nitrogen.getGas(2000)) .duration(10 * SECONDS) .eut(30) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // C2H6O + C4H8 = C6H14O @@ -4484,7 +4484,7 @@ public class ChemicalRecipes implements Runnable { .itemOutputs(Materials.AntiKnock.getCells(1), Materials.Empty.getCells(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); // Potassium Dichromate // 2KNO3 + 2CrO3 = K2Cr2O7 + 2NO + 3O @@ -4495,7 +4495,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricOxide.getGas(2000)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.PotassiumNitrade.getDust(10), Materials.ChromiumTrioxide.getDust(8)) @@ -4503,7 +4503,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricOxide.getGas(2000)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .addTo(chemicalReactorRecipes); } public void multiblockOnly() { @@ -4514,7 +4514,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(GT_ModHandler.getDistilledWater(8000)) .duration(4 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.PotassiumNitrade.getDust(10), Materials.ChromiumTrioxide.getDust(8)) @@ -4522,7 +4522,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Saltpeter.getDust(10), Materials.ChromiumTrioxide.getDust(8)) @@ -4530,7 +4530,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // Potassium Dichromate shortcut // 2 Cr + 6O + 10 Saltpeter/Potassium Dichromate = 10 K2Cr2O7 + 2NO + 3O @@ -4550,7 +4550,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16)) .duration(2 * MINUTES + 8 * SECONDS) .eut((int) GT_Values.VP[7]) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4567,7 +4567,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16)) .duration(2 * MINUTES + 8 * SECONDS) .eut((int) GT_Values.VP[7]) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -4575,7 +4575,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Dimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000)) .duration(3 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4586,7 +4586,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 8000)) .duration(3 * SECONDS) .eut(150) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4597,7 +4597,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 72000)) .duration(8 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4608,7 +4608,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(ItemList.sNickelSulfate, 18000)) .duration(1 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4619,7 +4619,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(ItemList.sBlueVitriol, 18000)) .duration(1 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4631,7 +4631,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Radon.getGas(800)) .duration(1 * MINUTES + 15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 3SiO2 + 4Al = 3Si + 2Al2O3 @@ -4645,7 +4645,7 @@ public class ChemicalRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10)) .duration(10 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 10Si + 30HCl -> 0.3 SiH2Cl2 + 9 HSiCl3 + 0.3 SiCl4 + 0.2 Si2Cl6 + 20.4H @@ -4662,7 +4662,7 @@ public class ChemicalRecipes implements Runnable { Materials.Hydrogen.getGas(20400)) .duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 2CO + 2C3H6 + 4H =RhHCO(P(C6H5)3)3= C4H8O + C4H8O @@ -4675,7 +4675,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.Butyraldehyde.getFluid(1000), MaterialsKevlar.Isobutyraldehyde.getFluid(1000)) .duration(15 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.OrganorhodiumCatalyst.getDust(1)) @@ -4686,7 +4686,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.Butyraldehyde.getFluid(9000), MaterialsKevlar.Isobutyraldehyde.getFluid(9000)) .duration(1 * MINUTES + 40 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C2H4 + O =Al2O3,Ag= C2H4O @@ -4699,7 +4699,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.EthyleneOxide.getGas(1000)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4710,7 +4710,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.EthyleneOxide.getGas(9000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -4721,7 +4721,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000)) .duration(15 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(8)) @@ -4732,7 +4732,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(45000)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // NH3 + CH4O =SiO2,Al2O3= CH5N + H2O @@ -4745,7 +4745,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.Methylamine.getGas(1000), Materials.Water.getFluid(1000)) .duration(1 * MINUTES + 15 * SECONDS) .eut(500000) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4757,7 +4757,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.PolyurethaneResin.getFluid(1000)) .duration(10 * SECONDS) .eut(500000) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4769,7 +4769,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.PolyurethaneResin.getFluid(9000)) .duration(1 * MINUTES + 15 * SECONDS) .eut(500000) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 3NH3 + 6CH4O =Al2O3,SiO2= CH5N + C2H7N + C3H9N + 6H2O @@ -4786,7 +4786,7 @@ public class ChemicalRecipes implements Runnable { Materials.Water.getFluid(6000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4801,7 +4801,7 @@ public class ChemicalRecipes implements Runnable { Materials.Water.getFluid(54000)) .duration(2 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 18SOCl2 + 5C10H10O4 + 6CO2 = 7C8H4Cl2O2 + 22HCl + 18SO2 @@ -4817,7 +4817,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(22000), Materials.SulfurDioxide.getGas(18000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 2CH4O + C8H6O4 =H2SO4= C10H10O4 + 2H2O @@ -4832,7 +4832,7 @@ public class ChemicalRecipes implements Runnable { Materials.DilutedSulfuricAcid.getFluid(2000)) .duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -4845,7 +4845,7 @@ public class ChemicalRecipes implements Runnable { Materials.DilutedSulfuricAcid.getFluid(18000)) .duration(1 * MINUTES + 27 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -4853,7 +4853,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000)) .duration(3 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(3)) @@ -4861,7 +4861,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000)) .duration(3 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4877,7 +4877,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(10000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -4896,7 +4896,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.AceticAcid.getFluid(15000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // PCl3 + 3C6H5Cl + 6Na = 6NaCl + C18H15P @@ -4908,7 +4908,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(1000), Materials.Chlorobenzene.getFluid(3000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 4NaH + C3H9BO3 = NaBH4 + 3CH3ONa @@ -4918,7 +4918,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(MaterialsKevlar.TrimethylBorate.getFluid(1000)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.SodiumHydride.getDust(64)) @@ -4930,7 +4930,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(MaterialsKevlar.TrimethylBorate.getFluid(8000)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 2CH3COOH = CH3COCH3 + CO2 + H @@ -4943,7 +4943,7 @@ public class ChemicalRecipes implements Runnable { Materials.Water.getFluid(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(0, Materials.Calcium.getDust(1)), GT_Utility.getIntegratedCircuit(24)) @@ -4954,7 +4954,7 @@ public class ChemicalRecipes implements Runnable { Materials.Water.getFluid(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(0, Materials.Quicklime.getDust(2)), GT_Utility.getIntegratedCircuit(24)) @@ -4965,7 +4965,7 @@ public class ChemicalRecipes implements Runnable { Materials.Water.getFluid(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C + 4H + O = CH3OH @@ -4975,7 +4975,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Methanol.getFluid(1000)) .duration(16 * SECONDS) .eut(96) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // This recipe collides with one for Vinyl Chloride // 2C + 4H + 2O = CH3COOH @@ -4986,7 +4986,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.AceticAcid.getFluid(1000)) .duration(24 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 2CO + 4H = CH3COOH @@ -4996,7 +4996,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.AceticAcid.getFluid(1000)) .duration(16 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(8)) @@ -5004,7 +5004,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HydrochloricAcid.getFluid(9000)) .duration(7 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -5015,7 +5015,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HypochlorousAcid.getFluid(10000), Materials.Hydrogen.getGas(10000)) .duration(30 * SECONDS) .eut(8) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // H2O + 4Cl + C3H6 + NaOH = C3H5ClO + NaCl·H2O + 2HCl @@ -5031,7 +5031,7 @@ public class ChemicalRecipes implements Runnable { Materials.HydrochloricAcid.getFluid(2000)) .duration(32 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // H2O + 2Cl + C3H6 + NaOH =Hg= C3H5ClO + NaCl·H2O + 2H @@ -5048,7 +5048,7 @@ public class ChemicalRecipes implements Runnable { Materials.Hydrogen.getGas(2000)) .duration(32 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // HClO + 2Cl + C3H6 + NaOH = C3H5ClO + NaCl·H2O + HCl @@ -5064,7 +5064,7 @@ public class ChemicalRecipes implements Runnable { Materials.HydrochloricAcid.getFluid(1000)) .duration(32 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Apatite.getDust(9)) @@ -5073,7 +5073,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.PhosphoricAcid.getFluid(3000), Materials.HydrochloricAcid.getFluid(1000)) .duration(16 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Phosphorus.getDust(4), GT_Utility.getIntegratedCircuit(1)) @@ -5081,7 +5081,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Oxygen.getGas(10000)) .duration(2 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 2P + 5O + 3H2O = 2H3PO4 @@ -5091,7 +5091,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.PhosphoricAcid.getFluid(1000)) .duration(16 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -5102,7 +5102,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Cumene.getFluid(8000)) .duration(1 * MINUTES + 36 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5114,7 +5114,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Phenol.getFluid(1000), Materials.Acetone.getFluid(1000)) .duration(24 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -5125,7 +5125,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.BisphenolA.getFluid(1000), Materials.Water.getFluid(1000)) .duration(8 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24)) @@ -5137,7 +5137,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Epoxid.getMolten(1000), Materials.SaltWater.getFluid(2000)) .duration(24 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -5145,7 +5145,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HydrofluoricAcid.getFluid(9000)) .duration(7 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5156,7 +5156,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000), Materials.HydrochloricAcid.getFluid(12000)) .duration(27 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24)) @@ -5168,7 +5168,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000), Materials.DilutedHydrochloricAcid.getFluid(2000)) .duration(24 * SECONDS) .eut(96) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24)) @@ -5177,7 +5177,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(2000)) .duration(24 * SECONDS) .eut(96) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -5185,7 +5185,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Ammonia.getGas(1000)) .duration(16 * SECONDS) .eut(TierEU.HV * 3 / 4) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5193,7 +5193,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Ammonia.getGas(10000)) .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.HV * 3 / 4) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 2NH3 + 7O = N2O4 + 3H2O @@ -5203,7 +5203,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000)) .duration(24 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 7O + 6H + 2N = N2O4 + 3H2O @@ -5216,7 +5216,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000)) .duration(55 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -5224,7 +5224,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricOxide.getGas(36000), Materials.Water.getFluid(54000)) .duration(8 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(8)) @@ -5232,7 +5232,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricOxide.getGas(36000)) .duration(8 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -5240,7 +5240,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitrogenDioxide.getGas(9000)) .duration(4 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -5248,7 +5248,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricAcid.getFluid(18000), Materials.NitricOxide.getGas(9000)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5259,7 +5259,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000)) .duration(16 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5267,7 +5267,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000)) .duration(16 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5278,7 +5278,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitricAcid.getFluid(2000)) .duration(16 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9)) @@ -5286,7 +5286,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HydricSulfide.getGas(9000)) .duration(4 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9)) @@ -5294,7 +5294,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.SulfurDioxide.getGas(9000)) .duration(4 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -5302,7 +5302,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.SulfurDioxide.getGas(9000), Materials.Water.getFluid(9000)) .duration(3 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(8)) @@ -5310,7 +5310,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.SulfurDioxide.getGas(9000)) .duration(3 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(7)) @@ -5318,7 +5318,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.SulfurDioxide.getGas(9000), Materials.HydricSulfide.getGas(18000)) .duration(3 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -5326,7 +5326,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.SulfuricAcid.getFluid(9000)) .duration(13 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // S + O3 + H2O = H2SO4 @@ -5336,7 +5336,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) .duration(24 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(7), Materials.Sulfur.getDust(9)) @@ -5344,7 +5344,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.SulfuricAcid.getFluid(9000)) .duration(13 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // H2S + O4 = H2SO4 @@ -5354,7 +5354,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) .duration(24 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // SO2 + O + H2O = H2SO4 @@ -5367,7 +5367,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) .duration(30 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -5378,7 +5378,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.SulfuricAcid.getFluid(9000)) .duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -5389,7 +5389,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.VinylChloride.getGas(1000), Materials.Water.getFluid(1000)) .duration(8 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5400,7 +5400,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.VinylChloride.getGas(2000), Materials.Water.getFluid(1000)) .duration(12 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -5411,7 +5411,7 @@ public class ChemicalRecipes implements Runnable { Materials.Titaniumtetrachloride.getFluid(80)) .duration(32 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -5422,7 +5422,7 @@ public class ChemicalRecipes implements Runnable { Materials.Titaniumtetrachloride.getFluid(80)) .duration(32 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(3)) @@ -5430,7 +5430,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Styrene.getFluid(36), Materials.Butadiene.getGas(108), Materials.Air.getGas(2000)) .duration(8 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(3)) @@ -5438,7 +5438,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Styrene.getFluid(72), Materials.Butadiene.getGas(216), Materials.Oxygen.getGas(2000)) .duration(8 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(4)) @@ -5452,7 +5452,7 @@ public class ChemicalRecipes implements Runnable { Materials.Air.getGas(15000)) .duration(32 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(4)) @@ -5464,7 +5464,7 @@ public class ChemicalRecipes implements Runnable { Materials.Oxygen.getGas(7500)) .duration(32 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Salt.getDust(18)) @@ -5473,7 +5473,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.HydrochloricAcid.getFluid(9000)) .duration(6 * SECONDS + 15 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.SodiumHydroxide.getDust(27)) @@ -5482,7 +5482,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(9000)) .duration(6 * SECONDS + 15 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5496,7 +5496,7 @@ public class ChemicalRecipes implements Runnable { Materials.DilutedHydrochloricAcid.getFluid(1000)) .duration(28 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C6H6 + 2Cl + NaOH = C6H6O + NaCl + HCl @@ -5507,7 +5507,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Phenol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000)) .duration(56 * SECONDS) .eut(30) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5515,7 +5515,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Fuel.getFluid(24000)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5523,7 +5523,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitroFuel.getFluid(10000)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5531,7 +5531,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitroFuel.getFluid(9000)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // CH4 + 2H2O = CO2 + 8H @@ -5541,7 +5541,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.CarbonDioxide.getGas(5000), Materials.Hydrogen.getGas(40000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // CH4 + H2O = CO + 6H @@ -5551,7 +5551,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.CarbonMonoxide.getGas(5000), Materials.Hydrogen.getGas(30000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5559,7 +5559,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.NitrousOxide.getGas(10000)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5571,7 +5571,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.GasolineRaw.getFluid(20000)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5579,7 +5579,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.GasolineRegular.getFluid(11000)) .duration(10 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5592,7 +5592,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.GasolinePremium.getFluid(32000)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C2H6O + C4H8 = C6H14O @@ -5602,7 +5602,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.AntiKnock.getFluid(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // CH4O + C4H8 = C5H12O @@ -5612,7 +5612,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.MTBEMixture.getGas(1000)) .duration(20 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -5623,7 +5623,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.EnrichedNaquadria.getFluid(9216)) .duration(30 * SECONDS) .eut(500000) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) { // CH2O + 2C6H7N + HCl = C13H14N2(HCl) + H2O @@ -5637,7 +5637,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C6H5NO2 + 6H =Pd= C6H7N + 2H2O @@ -5651,7 +5651,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(18000), new FluidStack(FluidRegistry.getFluid("aniline"), 9000)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C6H6 + HNO3 =H2SO4= C6H5NO2 + H2O @@ -5667,7 +5667,7 @@ public class ChemicalRecipes implements Runnable { Materials.DilutedSulfuricAcid.getFluid(3000)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C13H14N2(HCl) + 2COCl2 = C15H10N2O2(5HCl) @@ -5679,7 +5679,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5689,7 +5689,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 9000)) .duration(4 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5702,7 +5702,7 @@ public class ChemicalRecipes implements Runnable { Materials.IronIIIChloride.getFluid(100)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5715,7 +5715,7 @@ public class ChemicalRecipes implements Runnable { Materials.IronIIIChloride.getFluid(900)) .duration(3 * MINUTES + 45 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C2H4 + CO + H2O =C4NiO= C3H6O2 @@ -5729,7 +5729,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -5741,7 +5741,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000)) .duration(1 * MINUTES + 15 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C6H7N + HNO3 =H2SO4,C4H6O3= C6H6N2O2 + H2O @@ -5756,7 +5756,7 @@ public class ChemicalRecipes implements Runnable { Materials.DilutedSulfuricAcid.getFluid(1000)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -5769,7 +5769,7 @@ public class ChemicalRecipes implements Runnable { Materials.DilutedSulfuricAcid.getFluid(9000)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C6H6N2O2 + 6H =Pd,NO2= C6H8N2 + 2H2O @@ -5785,7 +5785,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(2000)) .duration(20 * SECONDS) .eut(500000) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C4H10O2 =Cu= C4H6O2 + 4H @@ -5797,7 +5797,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.GammaButyrolactone.getFluid(1000), Materials.Hydrogen.getGas(4000)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5807,7 +5807,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.GammaButyrolactone.getFluid(9000), Materials.Hydrogen.getGas(36000)) .duration(35 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 2CH2O + C2H2 =SiO2,CuO,Bi2O3= C4H6O2 @@ -5823,7 +5823,7 @@ public class ChemicalRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 2000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5839,7 +5839,7 @@ public class ChemicalRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 18000)) .duration(2 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // C4H6O2 + 4H =NiAl= C4H10O2 @@ -5852,7 +5852,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)) .duration(15 * SECONDS) .eut(500000) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5866,7 +5866,7 @@ public class ChemicalRecipes implements Runnable { Materials.DilutedHydrochloricAcid.getFluid(2000)) .duration(30 * SECONDS) .eut(500000) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5880,7 +5880,7 @@ public class ChemicalRecipes implements Runnable { Materials.DilutedHydrochloricAcid.getFluid(14000)) .duration(2 * MINUTES + 55 * SECONDS) .eut(500000) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // Na2B4O7(H2O)10 + 2HCl = 2NaCl + 4H3BO3 + 5H2O @@ -5893,7 +5893,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("boricacid"), 4000), Materials.Water.getFluid(5000)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // H3BO3 + 3CH4O =H2SO4= C3H9BO3 + 3H2O @@ -5908,7 +5908,7 @@ public class ChemicalRecipes implements Runnable { MaterialsKevlar.TrimethylBorate.getFluid(1000)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -5921,7 +5921,7 @@ public class ChemicalRecipes implements Runnable { MaterialsKevlar.TrimethylBorate.getFluid(9000)) .duration(3 * MINUTES + 45 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // RhCl3 + 3C18H15P + 3NaBH4 + CO = RhC55H46P3O + 3NaCl + 3B + 11H @@ -5941,7 +5941,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Hydrogen.getGas(11000)) .duration(40 * SECONDS) .eut(500000) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 2NaOH + N2H4 =Mn= 2N + 2H2O + 2NaH @@ -5955,7 +5955,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Nitrogen.getGas(2000), Materials.Water.getFluid(2000)) .duration(10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -5967,7 +5967,7 @@ public class ChemicalRecipes implements Runnable { .fluidOutputs(Materials.Nitrogen.getGas(18000), Materials.Water.getFluid(18000)) .duration(3 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java index a552369087..10aaff6b4d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java @@ -3,8 +3,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.recipe.RecipeMaps.circuitAssemblerRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.loaders.postload.GT_MachineRecipeLoader.solderingMats; @@ -48,7 +48,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(15 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -59,7 +59,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(15 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -70,7 +70,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(15 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -81,7 +81,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(20 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -92,7 +92,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(20 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -103,7 +103,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(20 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -114,7 +114,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(25 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -125,7 +125,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(25 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -136,7 +136,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .duration(25 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -150,7 +150,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -164,7 +164,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -178,7 +178,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -192,7 +192,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); } } @@ -214,7 +214,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(Materials.Glass.getMolten(576)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); // alternative version of the iron electron tube @@ -228,7 +228,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(Materials.Glass.getMolten(576)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); ItemStack[] rodMaterials = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Copper, 2L), @@ -257,7 +257,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(Materials.Glass.getMolten(576)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); } for (Materials tMat : solderingMats) { @@ -277,7 +277,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -291,7 +291,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -305,7 +305,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -319,7 +319,7 @@ public class CircuitAssemblerRecipes implements Runnable { .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .duration(10 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sCircuitAssemblerRecipes); + .addTo(circuitAssemblerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java index 6f7b8f4a04..ef7441c13b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java @@ -3,8 +3,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.init.Blocks; @@ -29,98 +29,98 @@ public class CompressorRecipes implements Runnable { .itemOutputs(ItemList.IC2_Plantball.get(1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Compressed_Coal_Chunk.get(1)) .itemOutputs(ItemList.IC2_Industrial_Diamond.get(1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1)) .itemOutputs(GT_ModHandler.getIC2Item("Uran238", 1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1)) .itemOutputs(GT_ModHandler.getIC2Item("Uran235", 1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1)) .itemOutputs(GT_ModHandler.getIC2Item("Plutonium", 1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1)) .itemOutputs(GT_ModHandler.getIC2Item("smallUran235", 1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1)) .itemOutputs(GT_ModHandler.getIC2Item("smallPlutonium", 1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.ice, 2, 32767)) .itemOutputs(new ItemStack(Blocks.packed_ice, 1, 0)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1)) .itemOutputs(new ItemStack(Blocks.ice, 1, 0)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4)) .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 10)) .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 11)) .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 12)) .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockFluix", 1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.quartz, 4, 0)) .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); /* * GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Items.wheat, 9, 0) ) .itemOutputs( new @@ -133,14 +133,14 @@ public class CompressorRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.glowstone, 1)) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Fireclay.getDust(1)) .itemOutputs(ItemList.CompressedFireclay.get(1)) .duration(4 * SECONDS) .eut(4) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); if (Railcraft.isModLoaded()) { GT_Values.RA.stdBuilder() @@ -148,7 +148,7 @@ public class CompressorRecipes implements Runnable { .itemOutputs(EnumCube.COKE_BLOCK.getItem()) .duration(15 * SECONDS) .eut(2) - .addTo(sCompressorRecipes); + .addTo(compressorRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java index cdf8a52e93..e69af249ee 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtractorRecipes; +import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; +import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; @@ -152,7 +152,7 @@ public class CropProcessingRecipes implements Runnable { .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10)))) .duration((int) (aMaterial.getMass() * 128)) .eut(384) - .addTo(sAutoclaveRecipes); + .addTo(autoclaveRecipes); } else { if (aMainOutput) { @@ -161,7 +161,7 @@ public class CropProcessingRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1)) .duration(15 * SECONDS) .eut(2) - .addTo(sExtractorRecipes); + .addTo(extractorRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java index e97bcce2af..dd81fd2d66 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java @@ -3,8 +3,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.BuildCraftTransport; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.TinkerConstruct; +import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCutterRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -235,7 +235,7 @@ public class CuttingRecipes implements Runnable { .duration(2 * duration) .eut(eut) .requiresCleanRoom() - .addTo(sCutterRecipes); + .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(inputs) @@ -244,7 +244,7 @@ public class CuttingRecipes implements Runnable { .duration(2 * duration) .eut(eut) .requiresCleanRoom() - .addTo(sCutterRecipes); + .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(inputs) @@ -253,7 +253,7 @@ public class CuttingRecipes implements Runnable { .duration(duration) .eut(eut) .requiresCleanRoom() - .addTo(sCutterRecipes); + .addTo(cutterRecipes); } else { GT_Values.RA.stdBuilder() .itemInputs(inputs) @@ -261,7 +261,7 @@ public class CuttingRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, duration * eut / 320)))) .duration(2 * duration) .eut(eut) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(inputs) @@ -269,7 +269,7 @@ public class CuttingRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * eut / 426)))) .duration(2 * duration) .eut(eut) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(inputs) @@ -277,7 +277,7 @@ public class CuttingRecipes implements Runnable { .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, duration * eut / 1280)))) .duration(duration) .eut(eut) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java index 30a938b6b9..6008eea927 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java @@ -1,8 +1,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.TinkerConstruct; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistillationRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistilleryRecipes; +import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; +import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; 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 DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(32L)) .duration(12 * SECONDS) .eut(30) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -47,7 +47,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(8L)) .duration(4 * SECONDS) .eut(30) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -55,7 +55,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(8L)) .duration(4 * SECONDS) .eut(30) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -63,7 +63,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(60L)) .duration(8 * SECONDS) .eut(30) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -71,7 +71,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(30L)) .duration(8 * SECONDS) .eut(30) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -79,7 +79,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(60L)) .duration(8 * SECONDS) .eut(30) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -87,7 +87,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(90L)) .duration(8 * SECONDS) .eut(30) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -95,7 +95,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Ethanol.getFluid(12L)) .duration(16 * TICKS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(5)) @@ -103,7 +103,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(12L)) .duration(16 * TICKS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(5)) @@ -111,7 +111,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(GT_ModHandler.getDistilledWater(5L)) .duration(16 * TICKS) .eut(10) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -119,7 +119,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.vodka", 1)) .duration(16 * TICKS) .eut(16) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -127,7 +127,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.alcopops", 1)) .duration(16 * TICKS) .eut(16) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(4)) @@ -135,7 +135,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Oil.getFluid(100L)) .duration(16 * TICKS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(4)) @@ -143,7 +143,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Oil.getFluid(100L)) .duration(16 * TICKS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(4)) @@ -151,7 +151,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Oil.getFluid(100L)) .duration(16 * TICKS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -160,7 +160,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(500)) .duration(5 * SECONDS) .eut(16) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(6)) @@ -168,7 +168,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(30)) .duration(16 * TICKS) .eut(64) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(6)) @@ -176,7 +176,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(20)) .duration(5 * SECONDS) .eut(64) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(7)) @@ -184,7 +184,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(30)) .duration(16 * TICKS) .eut(64) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(7)) @@ -192,7 +192,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(20)) .duration(5 * SECONDS) .eut(64) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); // (NaCl·H2O) = NaCl + H2O GT_Values.RA.stdBuilder() @@ -202,7 +202,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(GT_ModHandler.getDistilledWater(1000)) .duration(1 * MINUTES + 20 * SECONDS) .eut(30) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -211,7 +211,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.AceticAcid.getFluid(25)) .duration(1 * MINUTES + 15 * SECONDS) .eut(8) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -220,7 +220,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(375)) .duration(1 * MINUTES + 15 * SECONDS) .eut(8) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(3)) @@ -229,7 +229,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Ethanol.getFluid(150)) .duration(1 * MINUTES + 15 * SECONDS) .eut(8) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(4)) @@ -238,7 +238,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Methanol.getFluid(150)) .duration(1 * MINUTES + 15 * SECONDS) .eut(8) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(5)) @@ -247,7 +247,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Ammonia.getGas(100)) .duration(1 * MINUTES + 15 * SECONDS) .eut(8) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(6)) @@ -256,7 +256,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.CarbonDioxide.getGas(400)) .duration(1 * MINUTES + 15 * SECONDS) .eut(8) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(7)) @@ -265,7 +265,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Methane.getGas(600)) .duration(1 * MINUTES + 15 * SECONDS) .eut(8) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(17)) @@ -274,7 +274,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 1800)) .duration(1 * MINUTES + 20 * SECONDS) .eut(8) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -282,7 +282,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 3000)) .duration(8 * SECONDS) .eut(8) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -290,7 +290,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Benzene.getFluid(40)) .duration(8 * SECONDS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(3)) @@ -298,7 +298,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Phenol.getFluid(25)) .duration(8 * SECONDS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); // Dimethylbenzene GT_Values.RA.stdBuilder() @@ -307,7 +307,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Dimethylbenzene.getFluid(30)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(5)) @@ -315,7 +315,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Dimethylbenzene.getFluid(20)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -323,7 +323,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.OilHeavy.getFluid(15)) .duration(16 * TICKS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -331,7 +331,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(new FluidStack(ItemList.sToluene, 4)) .duration(16 * TICKS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -339,7 +339,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.LightFuel.getFluid(30L)) .duration(16 * TICKS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -347,7 +347,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 32)) .duration(2 * SECONDS) .eut(16) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -355,7 +355,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(2)) .duration(4 * SECONDS) .eut(30) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -363,7 +363,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(getFluidStack("potion.scotch", 1)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); if (TinkerConstruct.isModLoaded()) { @@ -373,7 +373,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(getFluidStack("glue", 8)) .duration(1 * TICKS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -381,7 +381,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Glue.getFluid(4L)) .duration(1 * TICKS) .eut(24) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); } } @@ -393,7 +393,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(500L)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -401,7 +401,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(500L)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -409,7 +409,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(500L)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)) @@ -417,14 +417,14 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Ethanol.getFluid(600L), Materials.Water.getFluid(300L)) .duration(1 * SECONDS + 12 * TICKS) .eut(400) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .fluidInputs(Materials.Water.getFluid(1000L)) .fluidOutputs(GT_ModHandler.getDistilledWater(1000L)) .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -432,7 +432,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(250L)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -440,7 +440,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(500L)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -448,7 +448,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.Lubricant.getFluid(750L)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); // C15H10N2O2(5HCl) = C15H10N2O2 + 5HCl GT_Values.RA.stdBuilder() @@ -457,7 +457,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(Materials.HydrochloricAcid.getFluid(5000L)) .duration(2 * MINUTES + 5 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -470,7 +470,7 @@ public class DistilleryRecipes implements Runnable { MaterialsKevlar.IIIDimethylbenzene.getFluid(100)) .duration(2 * SECONDS) .eut(256) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -483,7 +483,7 @@ public class DistilleryRecipes implements Runnable { MaterialsKevlar.IIIDimethylbenzene.getFluid(150)) .duration(2 * SECONDS) .eut(256) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(3)) @@ -496,7 +496,7 @@ public class DistilleryRecipes implements Runnable { MaterialsKevlar.IVDimethylbenzene.getFluid(100)) .duration(2 * SECONDS) .eut(256) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(4)) @@ -511,7 +511,7 @@ public class DistilleryRecipes implements Runnable { MaterialsKevlar.IVDimethylbenzene.getFluid(20)) .duration(2 * SECONDS) .eut(256) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(4)) @@ -526,7 +526,7 @@ public class DistilleryRecipes implements Runnable { MaterialsKevlar.IVDimethylbenzene.getFluid(30)) .duration(2 * SECONDS) .eut(256) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -539,7 +539,7 @@ public class DistilleryRecipes implements Runnable { Materials.SulfuricGas.getGas(2400)) .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -552,7 +552,7 @@ public class DistilleryRecipes implements Runnable { Materials.SulfuricGas.getGas(600)) .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -565,7 +565,7 @@ public class DistilleryRecipes implements Runnable { Materials.SulfuricGas.getGas(600)) .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(9)) @@ -578,7 +578,7 @@ public class DistilleryRecipes implements Runnable { Materials.SulfuricGas.getGas(600)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); // 9C5H12O = 4C6H14O + 5CH4O + 4C4H8 GT_Values.RA.stdBuilder() @@ -589,7 +589,7 @@ public class DistilleryRecipes implements Runnable { Materials.Butene.getGas(400L)) .duration(2 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemOutputs(ItemList.IC2_Fertilizer.get(1)) @@ -604,7 +604,7 @@ public class DistilleryRecipes implements Runnable { Materials.Methane.getGas(600)) .duration(3 * SECONDS + 15 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .itemOutputs(ItemList.IC2_Fertilizer.get(1)) @@ -612,13 +612,13 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000), Materials.Water.getFluid(125L)) .duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); GT_Values.RA.stdBuilder() .fluidInputs(new FluidStack(ItemList.sOilExtraHeavy, 1000)) .fluidOutputs(Materials.OilHeavy.getFluid(1500)) .duration(16 * TICKS) .eut(2400) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); } public void universalDistillationTowerRecipes() { @@ -1239,7 +1239,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(aOutputs[i]) .duration(2 * aDuration) .eut(aEUt / 4) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); } GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder() .itemInputs(aCircuit); @@ -1250,7 +1250,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(aOutputs) .duration(aDuration) .eut(aEUt) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); } public void addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, @@ -1265,7 +1265,7 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(aOutputs[i]) .duration(2 * aDuration) .eut(aEUt / 4) - .addTo(sDistilleryRecipes); + .addTo(distilleryRecipes); } GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder(); if (aOutput2 != GT_Values.NI) { @@ -1275,6 +1275,6 @@ public class DistilleryRecipes implements Runnable { .fluidOutputs(aOutputs) .duration(aDuration) .eut(aEUt) - .addTo(sDistillationRecipes); + .addTo(distillationTowerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java index d2ac35c08e..efcfa7e3dc 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes; +import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -31,7 +31,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Hydrogen.getGas(2000L)) .duration(1 * MINUTES + 40 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2), ItemList.Cell_Empty.get(1L)) @@ -40,7 +40,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Hydrogen.getGas(2000L)) .duration(1 * MINUTES + 40 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(3), ItemList.Cell_Empty.get(2L)) @@ -49,7 +49,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Oxygen.getGas(1000L)) .duration(1 * MINUTES + 40 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(4), ItemList.Cell_Empty.get(2L)) @@ -58,7 +58,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Oxygen.getGas(1000L)) .duration(1 * MINUTES + 40 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L), ItemList.Cell_Empty.get(2L)) @@ -67,7 +67,7 @@ public class ElectrolyzerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) .duration(1 * SECONDS + 10 * TICKS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L), GT_Utility.getIntegratedCircuit(1)) @@ -75,42 +75,42 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Hydrogen.getGas(2000L)) .duration(1 * SECONDS + 10 * TICKS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L)) .itemOutputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L)) .duration(1 * MINUTES + 13 * SECONDS + 10 * TICKS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Dye_Bonemeal.get(3L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L)) .duration(4 * SECONDS + 18 * TICKS) .eut(26) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.sand, 8, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L)) .duration(25 * SECONDS) .eut(25) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.sand, 8, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L)) .duration(25 * SECONDS) .eut(25) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 4)) .duration(5 * SECONDS) .eut(64) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // ZnS = Zn + S + 1 Ga(9.17%) GT_Values.RA.stdBuilder() @@ -122,7 +122,7 @@ public class ElectrolyzerRecipes implements Runnable { .outputChances(10000, 10000, 917) .duration(10 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // IC2 Fertilizer = H2O + CaCO3 + C GT_Values.RA.stdBuilder() @@ -133,7 +133,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(1000L)) .duration(5 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // NaOH = Na + O + H GT_Values.RA.stdBuilder() @@ -143,7 +143,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Oxygen.getGas(1000)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -152,7 +152,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Oxygen.getGas(2000)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(2)) @@ -160,7 +160,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidInputs(Materials.CarbonDioxide.getGas(1000)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // SO2 = S + 2O GT_Values.RA.stdBuilder() @@ -170,7 +170,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Oxygen.getGas(2000)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(2)) @@ -178,7 +178,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidInputs(Materials.SulfurDioxide.getGas(1000)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // NaCl = Na +Cl GT_Values.RA.stdBuilder() @@ -187,7 +187,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Chlorine.getGas(1000)) .duration(16 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // (NaCl·H2O)= NaOH + H GT_Values.RA.stdBuilder() @@ -197,7 +197,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Chlorine.getGas(1000)) .duration(36 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(11)) @@ -206,7 +206,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Hydrogen.getGas(1000)) .duration(36 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // HCl = H + Cl GT_Values.RA.stdBuilder() @@ -216,7 +216,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Chlorine.getGas(1000)) .duration(36 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(11)) @@ -225,7 +225,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Hydrogen.getGas(1000)) .duration(36 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) @@ -233,7 +233,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Chlorine.getGas(1000)) .duration(36 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) @@ -241,7 +241,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Hydrogen.getGas(1000)) .duration(36 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // 2NaHSO4 = 2H + Na2S2O8 GT_Values.RA.stdBuilder() @@ -250,7 +250,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.SodiumPersulfate.getFluid(1000)) .duration(30 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemOutputs( @@ -262,7 +262,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(2000)) .duration(15 * SECONDS) .eut(192) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Cell_Empty.get(1)) @@ -273,7 +273,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) .duration(45 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Cell_Empty.get(1)) @@ -284,7 +284,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) .duration(45 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Cell_Empty.get(1)) @@ -295,7 +295,7 @@ public class ElectrolyzerRecipes implements Runnable { .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) .duration(45 * SECONDS) .eut(30) - .addTo(sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java index 2fd92c6a07..d9031ac64f 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sElectroMagneticSeparatorRecipes; +import static gregtech.api.recipe.RecipeMaps.electroMagneticSeparatorRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import gregtech.api.enums.GT_Values; @@ -18,7 +18,7 @@ public class ElectromagneticSeparatorRecipes implements Runnable { .outputChances(4000, 2000, 2000) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV / 2) - .addTo(sElectroMagneticSeparatorRecipes); + .addTo(electroMagneticSeparatorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.TengamRaw.getDust(1)) @@ -29,6 +29,6 @@ public class ElectromagneticSeparatorRecipes implements Runnable { .outputChances(10000, 1000, 1000) .duration(10 * SECONDS) .eut(TierEU.RECIPE_UHV) - .addTo(sElectroMagneticSeparatorRecipes); + .addTo(electroMagneticSeparatorRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java index 3cd8f19315..e26c4fef97 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; +import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.util.GT_ModHandler.getIC2Item; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtractorRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; @@ -43,6 +43,6 @@ public class ExtractorRecipes implements Runnable { .itemOutputs(output) .duration(15 * SECONDS) .eut(2) - .addTo(sExtractorRecipes); + .addTo(extractorRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java index f916981c33..e52ad3d4fb 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtruderRecipes; +import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -17,13 +17,13 @@ public class ExtruderRecipes implements Runnable { .itemOutputs(ItemList.FR_WaxCapsule.get(1L)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) - .addTo(sExtruderRecipes); + .addTo(extruderRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.FR_RefractoryWax.get(1L), ItemList.Shape_Extruder_Cell.get(0L)) .itemOutputs(ItemList.FR_RefractoryCapsule.get(1L)) .duration(6 * SECONDS + 8 * TICKS) .eut(16) - .addTo(sExtruderRecipes); + .addTo(extruderRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java index d73dcd891a..c0954fda18 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFermentingRecipes; +import static gregtech.api.recipe.RecipeMaps.fermentingRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -22,273 +22,273 @@ public class FermenterRecipes implements Runnable { .fluidOutputs(Materials.FermentedBiomass.getFluid(100)) .duration(7 * SECONDS + 10 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 100)) .fluidOutputs(Materials.FermentedBiomass.getFluid(100)) .duration(7 * SECONDS + 10 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("milk", 50)) .fluidOutputs(getFluidStack("potion.mundane", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.lemonjuice", 50)) .fluidOutputs(getFluidStack("potion.limoncello", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.applejuice", 50)) .fluidOutputs(getFluidStack("potion.cider", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.goldenapplejuice", 50)) .fluidOutputs(getFluidStack("potion.goldencider", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.idunsapplejuice", 50)) .fluidOutputs(getFluidStack("potion.notchesbrew", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.reedwater", 50)) .fluidOutputs(getFluidStack("potion.rum", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.rum", 50)) .fluidOutputs(getFluidStack("potion.piratebrew", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.grapejuice", 50)) .fluidOutputs(getFluidStack("potion.wine", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.wine", 50)) .fluidOutputs(getFluidStack("potion.vinegar", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.scotch", 50)) .fluidOutputs(getFluidStack("potion.glenmckenner", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.wheatyhopsjuice", 50)) .fluidOutputs(getFluidStack("potion.beer", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.hopsjuice", 50)) .fluidOutputs(getFluidStack("potion.darkbeer", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.darkbeer", 50)) .fluidOutputs(getFluidStack("potion.dragonblood", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.beer", 75)) .fluidOutputs(getFluidStack("potion.vinegar", 50)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.cider", 75)) .fluidOutputs(getFluidStack("potion.vinegar", 50)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.goldencider", 75)) .fluidOutputs(getFluidStack("potion.vinegar", 50)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.rum", 75)) .fluidOutputs(getFluidStack("potion.vinegar", 50)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.wine", 75)) .fluidOutputs(getFluidStack("potion.vinegar", 50)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.awkward", 50)) .fluidOutputs(getFluidStack("potion.weakness", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.mundane", 50)) .fluidOutputs(getFluidStack("potion.weakness", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.thick", 50)) .fluidOutputs(getFluidStack("potion.weakness", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.poison", 50)) .fluidOutputs(getFluidStack("potion.damage", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.health", 50)) .fluidOutputs(getFluidStack("potion.damage", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.waterbreathing", 50)) .fluidOutputs(getFluidStack("potion.damage", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.nightvision", 50)) .fluidOutputs(getFluidStack("potion.invisibility", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.fireresistance", 50)) .fluidOutputs(getFluidStack("potion.slowness", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.speed", 50)) .fluidOutputs(getFluidStack("potion.slowness", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.strength", 50)) .fluidOutputs(getFluidStack("potion.weakness", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.regen", 50)) .fluidOutputs(getFluidStack("potion.poison", 25)) .duration(51 * SECONDS + 4 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.poison.strong", 50)) .fluidOutputs(getFluidStack("potion.damage.strong", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.health.strong", 50)) .fluidOutputs(getFluidStack("potion.damage.strong", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.nightvision.long", 50)) .fluidOutputs(getFluidStack("potion.invisibility.long", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.regen.strong", 50)) .fluidOutputs(getFluidStack("potion.poison.strong", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.fireresistance.long", 50)) .fluidOutputs(getFluidStack("potion.slowness.long", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.speed.long", 50)) .fluidOutputs(getFluidStack("potion.slowness.long", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.strength.long", 50)) .fluidOutputs(getFluidStack("potion.weakness.long", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); GT_Values.RA.stdBuilder() .fluidInputs(getFluidStack("potion.regen.long", 50)) .fluidOutputs(getFluidStack("potion.poison.long", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) .eut(2) - .addTo(sFermentingRecipes); + .addTo(fermentingRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java index 23acb5c772..ea2b87996f 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -16,7 +16,7 @@ public class FluidCannerRecipes implements Runnable { .fluidInputs(Materials.Redstone.getMolten(288)) .duration(4) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Battery_Hull_LV.get(1)) @@ -24,7 +24,7 @@ public class FluidCannerRecipes implements Runnable { .fluidInputs(Materials.Mercury.getFluid(1000)) .duration(16) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Battery_Hull_MV.get(1)) @@ -32,7 +32,7 @@ public class FluidCannerRecipes implements Runnable { .fluidInputs(Materials.Mercury.getFluid(4000)) .duration(64) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Battery_Hull_HV.get(1)) @@ -40,7 +40,7 @@ public class FluidCannerRecipes implements Runnable { .fluidInputs(Materials.Mercury.getFluid(16000)) .duration(258) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Battery_Hull_LV.get(1)) @@ -48,7 +48,7 @@ public class FluidCannerRecipes implements Runnable { .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) .duration(16) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Battery_Hull_MV.get(1)) @@ -56,7 +56,7 @@ public class FluidCannerRecipes implements Runnable { .fluidInputs(Materials.SulfuricAcid.getFluid(4000)) .duration(64) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Battery_Hull_HV.get(1)) @@ -64,7 +64,7 @@ public class FluidCannerRecipes implements Runnable { .fluidInputs(Materials.SulfuricAcid.getFluid(16000)) .duration(258) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.TF_Vial_FieryTears.get(1)) @@ -72,7 +72,7 @@ public class FluidCannerRecipes implements Runnable { .fluidOutputs(Materials.FierySteel.getFluid(250)) .duration(4) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Spray_Color_Remover_Empty.get(1)) @@ -80,7 +80,7 @@ public class FluidCannerRecipes implements Runnable { .itemOutputs(ItemList.Spray_Color_Remover.get(1)) .duration(74) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Spray_Color_Remover.get(1)) @@ -88,6 +88,6 @@ public class FluidCannerRecipes implements Runnable { .fluidOutputs(Materials.Acetone.getFluid(4000)) .duration(74) .eut(1) - .addTo(sFluidCannerRecipes); + .addTo(fluidCannerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index 4bb712e99a..11861a9618 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -7,8 +7,8 @@ import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; @@ -22,6 +22,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; +import gregtech.api.recipe.RecipeCategories; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -35,21 +36,21 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(getFluidStack("squidink", 144)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Dye_Indigo.get(1L)) .fluidOutputs(getFluidStack("indigo", 144)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Indigo.get(1L)) .fluidOutputs(getFluidStack("indigo", 144)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_MilkWart.get(1L)) @@ -58,56 +59,56 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(GT_ModHandler.getMilk(150L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_OilBerry.get(1L)) .fluidOutputs(Materials.Oil.getFluid(100L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_UUMBerry.get(1L)) .fluidOutputs(Materials.UUMatter.getFluid(4L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_UUABerry.get(1L)) .fluidOutputs(Materials.UUAmplifier.getFluid(4L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fish, 1, 0)) .fluidOutputs(Materials.FishOil.getFluid(40L)) .duration(16 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fish, 1, 1)) .fluidOutputs(Materials.FishOil.getFluid(60L)) .duration(16 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fish, 1, 2)) .fluidOutputs(Materials.FishOil.getFluid(70L)) .duration(16 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fish, 1, 3)) .fluidOutputs(Materials.FishOil.getFluid(30L)) .duration(16 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.coal, 1, 1)) @@ -116,7 +117,7 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.WoodTar.getFluid(100L)) .duration(1 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) @@ -125,7 +126,7 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.Creosote.getFluid(5L)) .duration(16 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1L)) @@ -134,56 +135,57 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(100L)) .duration(1 * SECONDS + 12 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3)) .fluidOutputs(Materials.Mercury.getFluid(1000L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L)) .fluidOutputs(Materials.Mercury.getFluid(1000L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Monazite, 1L)) .fluidOutputs(Materials.Helium.getGas(200L)) .duration(3 * SECONDS + 4 * TICKS) .eut(64) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L, 0)) .fluidOutputs(Materials.ReinforceGlass.getMolten(144)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassPlate", 1L, 0)) .fluidOutputs(Materials.ReinforceGlass.getMolten(72)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassLense", 1L, 0)) .fluidOutputs(Materials.ReinforceGlass.getMolten(54)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1L)) .fluidOutputs(Materials.Steel.getMolten(19 * 144)) .duration(20 * SECONDS) .eut(90) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1L)) @@ -192,14 +194,16 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.Tin.getMolten(12 * 144)) .duration(20 * SECONDS) .eut(90) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(4L)) .fluidOutputs(Materials.Steel.getMolten(189)) .duration(2 * SECONDS) .eut(90) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(16L)) @@ -208,7 +212,8 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.Steel.getMolten(324)) .duration(20 * SECONDS) .eut(90) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("TritiumCell", 1)) @@ -217,28 +222,30 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.Tritium.getGas(32)) .duration(16 * TICKS) .eut(64) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 1L)) .fluidOutputs(Materials.Glass.getMolten(72)) .duration(30 * SECONDS) .eut(28) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) .fluidOutputs(Materials.Iron.getMolten(288)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1)) .fluidOutputs(Materials.Iron.getMolten(144)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) @@ -247,42 +254,48 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.Bronze.getMolten(1728)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) .fluidOutputs(Materials.Steel.getMolten(288)) .duration(20 * SECONDS) .eut(90) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14)) .fluidOutputs(Materials.Steel.getMolten(144)) .duration(20 * SECONDS) .eut(90) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .fluidOutputs(Materials.Steel.getMolten(1836)) .duration(20 * SECONDS) .eut(90) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0)) .fluidOutputs(Materials.Aluminium.getMolten(288)) .duration(25 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1)) .fluidOutputs(Materials.Aluminium.getMolten(144)) .duration(25 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) @@ -291,84 +304,96 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.Aluminium.getMolten(108L)) .duration(25 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3)) .fluidOutputs(Materials.StainlessSteel.getMolten(288)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4)) .fluidOutputs(Materials.StainlessSteel.getMolten(144)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .fluidOutputs(Materials.StainlessSteel.getMolten(1836)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6)) .fluidOutputs(Materials.Titanium.getMolten(288)) .duration(35 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7)) .fluidOutputs(Materials.Titanium.getMolten(144)) .duration(35 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .fluidOutputs(Materials.Titanium.getMolten(1836)) .duration(35 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9)) .fluidOutputs(Materials.TungstenSteel.getMolten(288)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10)) .fluidOutputs(Materials.TungstenSteel.getMolten(144)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .fluidOutputs(Materials.TungstenSteel.getMolten(1836)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12)) .fluidOutputs(Materials.Palladium.getMolten(288)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13)) .fluidOutputs(Materials.Palladium.getMolten(144)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) @@ -377,21 +402,24 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.NiobiumTitanium.getMolten(1728)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0)) .fluidOutputs(Materials.Iridium.getMolten(288)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1)) .fluidOutputs(Materials.Iridium.getMolten(144)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) @@ -400,21 +428,24 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.Enderium.getMolten(1728)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3)) .fluidOutputs(Materials.Osmium.getMolten(288)) .duration(55 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4)) .fluidOutputs(Materials.Osmium.getMolten(144)) .duration(55 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) @@ -423,77 +454,81 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.Naquadah.getMolten(1728)) .duration(55 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6)) .fluidOutputs(Materials.Neutronium.getMolten(288)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7)) .fluidOutputs(Materials.Neutronium.getMolten(144)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .fluidOutputs(Materials.Neutronium.getMolten(1836)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidExtractionRecipes); + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.wheat_seeds, 1, 32767)) .fluidOutputs(Materials.SeedOil.getFluid(10)) .duration(1 * SECONDS + 12 * TICKS) .eut(2) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.melon_seeds, 1, 32767)) .fluidOutputs(Materials.SeedOil.getFluid(10)) .duration(1 * SECONDS + 12 * TICKS) .eut(2) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.pumpkin_seeds, 1, 32767)) .fluidOutputs(Materials.SeedOil.getFluid(10)) .duration(1 * SECONDS + 12 * TICKS) .eut(2) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Rape.get(1)) .fluidOutputs(Materials.SeedOil.getFluid(125)) .duration(1 * SECONDS + 12 * TICKS) .eut(2) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.snowball, 1, 0)) .fluidOutputs(Materials.Water.getFluid(250L)) .duration(1 * SECONDS + 12 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.snow, 1, 0)) .fluidOutputs(Materials.Water.getFluid(1000L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L)) .fluidOutputs(Materials.Ice.getSolid(1000L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Forestry.ID, "phosphor", 1L)) @@ -502,7 +537,7 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(Materials.Lava.getFluid(800L)) .duration(12 * SECONDS + 16 * TICKS) .eut(128) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); // Beecombs fluid extractor recipes if (BartWorks.isModLoaded()) { @@ -512,7 +547,7 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(getFluidStack("xenon", 250)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_IV) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); // neon GT_Values.RA.stdBuilder() @@ -520,7 +555,7 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(getFluidStack("neon", 250)) .duration(15 * TICKS) .eut(TierEU.RECIPE_IV) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); // krpton GT_Values.RA.stdBuilder() @@ -528,7 +563,7 @@ public class FluidExtractorRecipes implements Runnable { .fluidOutputs(getFluidStack("krypton", 250)) .duration(1 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_IV) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java index 38890ebb26..b9cdfc4aa3 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidHeaterRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -21,7 +21,7 @@ public class FluidHeaterRecipes implements Runnable { .fluidOutputs(Materials.GrowthMediumSterilized.getFluid(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sFluidHeaterRecipes); + .addTo(fluidHeaterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -29,7 +29,7 @@ public class FluidHeaterRecipes implements Runnable { .fluidOutputs(Materials.BioMediumSterilized.getFluid(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sFluidHeaterRecipes); + .addTo(fluidHeaterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -37,7 +37,7 @@ public class FluidHeaterRecipes implements Runnable { .fluidOutputs(Materials.Water.getGas(960)) .duration(1 * SECONDS + 10 * TICKS) .eut(30) - .addTo(sFluidHeaterRecipes); + .addTo(fluidHeaterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -45,7 +45,7 @@ public class FluidHeaterRecipes implements Runnable { .fluidOutputs(Materials.Water.getGas(960)) .duration(1 * SECONDS + 10 * TICKS) .eut(30) - .addTo(sFluidHeaterRecipes); + .addTo(fluidHeaterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -53,7 +53,7 @@ public class FluidHeaterRecipes implements Runnable { .fluidOutputs(Materials.FryingOilHot.getFluid(16)) .duration(16 * TICKS) .eut(30) - .addTo(sFluidHeaterRecipes); + .addTo(fluidHeaterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -61,7 +61,7 @@ public class FluidHeaterRecipes implements Runnable { .fluidOutputs(Materials.FryingOilHot.getFluid(16)) .duration(16 * TICKS) .eut(30) - .addTo(sFluidHeaterRecipes); + .addTo(fluidHeaterRecipes); // Ca(CH3COO)2 = CH3COCH3 + CaO + CO2 GT_Values.RA.stdBuilder() @@ -70,7 +70,7 @@ public class FluidHeaterRecipes implements Runnable { .fluidOutputs(Materials.Acetone.getFluid(1000)) .duration(4 * SECONDS) .eut(30) - .addTo(sFluidHeaterRecipes); + .addTo(fluidHeaterRecipes); // Fluid Sodium GT_Values.RA.stdBuilder() @@ -81,7 +81,7 @@ public class FluidHeaterRecipes implements Runnable { .fluidOutputs(Materials.Sodium.getFluid(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidHeaterRecipes); + .addTo(fluidHeaterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -89,7 +89,7 @@ public class FluidHeaterRecipes implements Runnable { .fluidOutputs(Materials.Ethenone.getGas(1000)) .duration(8 * SECONDS) .eut(160) - .addTo(sFluidHeaterRecipes); + .addTo(fluidHeaterRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java index d194da4469..2d52f9eb69 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java @@ -4,8 +4,8 @@ import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidSolidficationRecipes; import static gregtech.api.util.GT_RecipeBuilder.INGOTS; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -55,7 +55,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(materialArray[i].getMolten(72L)) .duration(16 * TICKS) .eut(8) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); } { @@ -69,7 +69,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(new FluidStack(FluidRegistry.getFluid("molten.borosilicateglass"), 144)) .duration(2 * SECONDS + 4 * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); } GT_Values.RA.stdBuilder() @@ -78,7 +78,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Mercury.getFluid(1000L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) @@ -86,7 +86,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Mercury.getFluid(1000L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) @@ -94,7 +94,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(250L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) @@ -102,7 +102,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(250L)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) @@ -110,7 +110,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(1000L)) .duration(25 * SECONDS + 12 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) @@ -118,7 +118,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(1000L)) .duration(25 * SECONDS + 12 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) @@ -126,7 +126,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Lava.getFluid(1000L)) .duration(51 * SECONDS + 4 * TICKS) .eut(16) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) @@ -134,7 +134,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Concrete.getMolten(144L)) .duration(12 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) @@ -142,7 +142,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Glowstone.getMolten(576L)) .duration(12 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) @@ -150,7 +150,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Glass.getMolten(144L)) .duration(12 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) @@ -158,7 +158,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Glass.getMolten(144L)) .duration(12 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Bottle.get(0L)) @@ -166,7 +166,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Glass.getMolten(144L)) .duration(12 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Cylinder.get(0L)) @@ -174,7 +174,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Milk.getFluid(250L)) .duration(51 * SECONDS + 4 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Cylinder.get(0L)) @@ -182,7 +182,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Cheese.getMolten(144L)) .duration(3 * SECONDS + 4 * TICKS) .eut(8) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) @@ -190,7 +190,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Iron.getMolten(4464L)) .duration(6 * SECONDS + 8 * TICKS) .eut(16) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) @@ -198,7 +198,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.WroughtIron.getMolten(4464L)) .duration(6 * SECONDS + 8 * TICKS) .eut(16) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) @@ -206,7 +206,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Boron.getMolten(144L)) .duration(1 * SECONDS + 10 * TICKS) .eut(30) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Cylinder.get(0)) @@ -214,7 +214,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(36)) .duration(8 * SECONDS) .eut(16) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Cylinder.get(0)) @@ -222,7 +222,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Polystyrene.getMolten(36)) .duration(8 * SECONDS) .eut(16) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Cylinder.get(0)) @@ -230,7 +230,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.BorosilicateGlass.getMolten(72)) .duration(8 * SECONDS) .eut(16) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) @@ -238,7 +238,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.ReinforceGlass.getMolten(72)) .duration(8 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) @@ -246,7 +246,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.ReinforceGlass.getMolten(144)) .duration(8 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) @@ -254,7 +254,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Glass.getMolten(144)) .duration(10 * SECONDS) .eut(24) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) @@ -262,7 +262,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.ReinforceGlass.getMolten(288)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) @@ -270,7 +270,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(getFluidStack("glass.molten", 1000)) .duration(10 * SECONDS) .eut(24) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) @@ -278,7 +278,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(new FluidStack(ItemList.sToluene, 100)) .duration(5 * SECONDS) .eut(16) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Nugget.get(0L)) @@ -286,7 +286,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.AnnealedCopper.getMolten(16)) .duration(16 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ingot.get(0L)) @@ -294,7 +294,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.AnnealedCopper.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) @@ -302,7 +302,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.AnnealedCopper.getMolten(1296)) .duration(14 * SECONDS + 8 * TICKS) .eut(8) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Nugget.get(0L)) @@ -310,7 +310,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.WroughtIron.getMolten(16)) .duration(16 * TICKS) .eut(4) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ingot.get(0L)) @@ -318,7 +318,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.WroughtIron.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) @@ -326,7 +326,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.WroughtIron.getMolten(1296)) .duration(14 * SECONDS + 8 * TICKS) .eut(8) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Spinneret.get(0L)) @@ -334,7 +334,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsKevlar.LiquidCrystalKevlar.getFluid(144L)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) @@ -342,7 +342,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(Materials.Steel.getMolten(4464L)) .duration(6 * SECONDS + 8 * TICKS) .eut(16) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); final int whiteDwarfShapeSolidifierTime = 10 * SECONDS; final int fluidPerShapeSolidifierRecipe = 4 * INGOTS; @@ -354,7 +354,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Plate.get(1)) @@ -362,7 +362,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Cell.get(1)) @@ -370,7 +370,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Ring.get(1)) @@ -378,7 +378,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Rod.get(1)) @@ -386,7 +386,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Bolt.get(1)) @@ -394,7 +394,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Ingot.get(1)) @@ -402,7 +402,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Wire.get(1)) @@ -410,7 +410,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Casing.get(1)) @@ -418,7 +418,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pipe_Tiny.get(1)) @@ -426,7 +426,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pipe_Small.get(1)) @@ -434,7 +434,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pipe_Medium.get(1)) @@ -442,7 +442,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pipe_Large.get(1)) @@ -450,7 +450,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pipe_Huge.get(1)) @@ -458,7 +458,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Block.get(1)) @@ -466,7 +466,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Sword.get(1)) @@ -474,7 +474,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pickaxe.get(1)) @@ -482,7 +482,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Shovel.get(1)) @@ -490,7 +490,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Axe.get(1)) @@ -498,7 +498,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Hoe.get(1)) @@ -506,7 +506,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Hammer.get(1)) @@ -514,7 +514,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_File.get(1)) @@ -522,7 +522,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Saw.get(1)) @@ -530,7 +530,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Gear.get(1)) @@ -538,7 +538,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Rotor.get(1)) @@ -546,7 +546,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Turbine_Blade.get(1)) @@ -554,7 +554,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Small_Gear.get(1)) @@ -562,7 +562,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_ToolHeadDrill.get(1)) @@ -570,7 +570,7 @@ public class FluidSolidifierRecipes implements Runnable { .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index b703076968..49ad1154c7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -2,8 +2,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.HardcoreEnderExpansion; +import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -29,112 +29,112 @@ public class ForgeHammerRecipes implements Runnable { .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 2)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.stone, 1, 0)) .itemOutputs(new ItemStack(Blocks.cobblestone, 1, 0)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.cobblestone, 1, 0)) .itemOutputs(new ItemStack(Blocks.gravel, 1, 0)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.gravel, 1, 0)) .itemOutputs(new ItemStack(Blocks.sand, 1, 0)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.sandstone, 1, 32767)) .itemOutputs(new ItemStack(Blocks.sand, 1, 0)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.ice, 1, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.packed_ice, 1, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 2)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.brick_block, 1, 0)) .itemOutputs(new ItemStack(Items.brick, 3, 0)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.nether_brick, 1, 0)) .itemOutputs(new ItemStack(Items.netherbrick, 3, 0)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.stained_glass, 1, 32767)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.glass, 1, 32767)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1)) .duration(10 * TICKS) .eut(10) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.stained_glass_pane, 1, 32767)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.glass_pane, 1, 32767)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Brick.getIngots(1)) .itemOutputs(Materials.Brick.getDustSmall(1)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Firebrick.get(1)) .itemOutputs(Materials.Brick.getDust(1)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Firebricks.get(1)) .itemOutputs(ItemList.Firebrick.get(3)) .duration(10 * TICKS) .eut(16) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); if (GTPlusPlus.isModLoaded()) { GT_Values.RA.stdBuilder() @@ -143,7 +143,7 @@ public class ForgeHammerRecipes implements Runnable { .fluidOutputs(MaterialsUEVplus.Space.getMolten(1440L), MaterialsUEVplus.Time.getMolten(1440L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_UXV) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); } if (HardcoreEnderExpansion.isModLoaded()) { @@ -152,7 +152,7 @@ public class ForgeHammerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 1)) .duration(16) .eut(10) - .addTo(sHammerRecipes); + .addTo(hammerRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java index 230dcad61a..80a34561e6 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java @@ -2,8 +2,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.BuildCraftSilicon; +import static gregtech.api.recipe.RecipeMaps.formingPressRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPressRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -30,7 +30,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -39,7 +39,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -48,7 +48,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -57,7 +57,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 3)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -66,7 +66,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 2L, 4)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -75,7 +75,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 5)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -84,7 +84,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 6)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); } if (AppliedEnergistics2.isModLoaded()) { @@ -95,7 +95,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16)) .duration(10 * SECONDS) .eut(16) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -104,7 +104,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16)) .duration(10 * SECONDS) .eut(16) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -113,7 +113,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 17)) .duration(10 * SECONDS) .eut(16) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -122,7 +122,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 18)) .duration(10 * SECONDS) .eut(16) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -131,7 +131,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20)) .duration(10 * SECONDS) .eut(16) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); } GT_Values.RA.stdBuilder() @@ -139,14 +139,14 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(ItemList.Food_Raw_Cake.get(1L)) .duration(19 * SECONDS + 4 * TICKS) .eut(4) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.glass, 1, 32767), ItemList.Shape_Mold_Arrow.get(0L)) .itemOutputs(ItemList.Arrow_Head_Glass_Emtpy.get(1L)) .duration(3 * SECONDS + 4 * TICKS) .eut(4) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -155,7 +155,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(ItemList.Credit_Greg_Cupronickel.get(4L)) .duration(5 * SECONDS) .eut(16) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -164,7 +164,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(ItemList.Coin_Doge.get(4L)) .duration(5 * SECONDS) .eut(16) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -173,7 +173,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(ItemList.Credit_Iron.get(4L)) .duration(5 * SECONDS) .eut(16) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -182,7 +182,7 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(ItemList.Credit_Iron.get(4L)) .duration(5 * SECONDS) .eut(16) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -191,6 +191,6 @@ public class FormingPressRecipes implements Runnable { .itemOutputs(new ItemStack(Items.brick, 1, 0)) .duration(5 * SECONDS) .eut(16) - .addTo(sPressRecipes); + .addTo(formingPressRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java index d3e3b0d339..2c3c979b11 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java @@ -24,8 +24,6 @@ public class FuelRecipes implements Runnable { .itemInputs(GT_ModHandler.getIC2Item("biogasCell", 1L)) .metadata(FUEL_VALUE, 40) .metadata(FUEL_TYPE, 1) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() @@ -33,128 +31,96 @@ public class FuelRecipes implements Runnable { .itemOutputs(new ItemStack(Items.apple, 1)) .metadata(FUEL_VALUE, 6400) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Thaumcraft.ID, "ItemShard", 1L, 6)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ForbiddenMagic.ID, "GluttonyShard", 1L)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ForbiddenMagic.ID, "FMResource", 1L, 3)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 1)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 2)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 3)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 4)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 5)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 6)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(TaintedMagic.ID, "ItemMaterial", 1L, 3)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(TaintedMagic.ID, "ItemMaterial", 1L, 4)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(TaintedMagic.ID, "ItemMaterial", 1L, 5)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7)) .metadata(FUEL_VALUE, 720) .metadata(FUEL_TYPE, 5) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java index 1a78db2ee3..2d533dde0c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFusionRecipes; +import static gregtech.api.recipe.RecipeMaps.fusionRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD; @@ -26,7 +26,7 @@ public class FusionReactorRecipes implements Runnable { .duration(3 * SECONDS + 4 * TICKS) .eut(TierEU.RECIPE_LuV) .metadata(FUSION_THRESHOLD, 300000000) - .addTo(sFusionRecipes); // FT1+ - utility + .addTo(fusionRecipes); // FT1+ - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Deuterium.getGas(125), Materials.Tritium.getGas(125)) @@ -34,7 +34,7 @@ public class FusionReactorRecipes implements Runnable { .duration(16 * TICKS) .eut(4096) .metadata(FUSION_THRESHOLD, 40000000) - .addTo(sFusionRecipes); // FT1 Cheap - farmable + .addTo(fusionRecipes); // FT1 Cheap - farmable GT_Values.RA.stdBuilder() .fluidInputs(Materials.Deuterium.getGas(125), Materials.Helium_3.getGas(125)) @@ -42,7 +42,7 @@ public class FusionReactorRecipes implements Runnable { .duration(16 * TICKS) .eut(2048) .metadata(FUSION_THRESHOLD, 60000000) - .addTo(sFusionRecipes); // FT1 Expensive // + .addTo(fusionRecipes); // FT1 Expensive // GT_Values.RA.stdBuilder() .fluidInputs(Materials.Aluminium.getMolten(16), Materials.Lithium.getMolten(16)) @@ -50,7 +50,7 @@ public class FusionReactorRecipes implements Runnable { .duration(1 * SECONDS + 12 * TICKS) .eut(10240) .metadata(FUSION_THRESHOLD, 240000000) - .addTo(sFusionRecipes); // FT1+ Cheap + .addTo(fusionRecipes); // FT1+ Cheap GT_Values.RA.stdBuilder() .fluidInputs(Materials.Beryllium.getMolten(16), Materials.Deuterium.getGas(375)) @@ -58,7 +58,7 @@ public class FusionReactorRecipes implements Runnable { .duration(16 * TICKS) .eut(16384) .metadata(FUSION_THRESHOLD, 180000000) - .addTo(sFusionRecipes); // FT1+ Expensive // + .addTo(fusionRecipes); // FT1+ Expensive // GT_Values.RA.stdBuilder() .fluidInputs(Materials.Silicon.getMolten(16), Materials.Magnesium.getMolten(16)) @@ -66,7 +66,7 @@ public class FusionReactorRecipes implements Runnable { .duration(1 * SECONDS + 12 * TICKS) .eut(8192) .metadata(FUSION_THRESHOLD, 360000000) - .addTo(sFusionRecipes); // FT1++ Cheap // + .addTo(fusionRecipes); // FT1++ Cheap // GT_Values.RA.stdBuilder() .fluidInputs(Materials.Potassium.getMolten(16), Materials.Fluorine.getGas(144)) @@ -74,7 +74,7 @@ public class FusionReactorRecipes implements Runnable { .duration(16 * TICKS) .eut(TierEU.RECIPE_LuV) .metadata(FUSION_THRESHOLD, 480000000) - .addTo(sFusionRecipes); // FT1++ Expensive // + .addTo(fusionRecipes); // FT1++ Expensive // GT_Values.RA.stdBuilder() .fluidInputs(Materials.Beryllium.getMolten(16), Materials.Tungsten.getMolten(16)) @@ -82,7 +82,7 @@ public class FusionReactorRecipes implements Runnable { .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_LuV) .metadata(FUSION_THRESHOLD, 150000000) - .addTo(sFusionRecipes); // FT1 - utility + .addTo(fusionRecipes); // FT1 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Neodymium.getMolten(16), Materials.Hydrogen.getGas(48)) @@ -90,7 +90,7 @@ public class FusionReactorRecipes implements Runnable { .duration(1 * SECONDS + 12 * TICKS) .eut(24576) .metadata(FUSION_THRESHOLD, 150000000) - .addTo(sFusionRecipes); // FT1 - utility + .addTo(fusionRecipes); // FT1 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Lutetium.getMolten(16), Materials.Chrome.getMolten(16)) @@ -98,7 +98,7 @@ public class FusionReactorRecipes implements Runnable { .duration(4 * SECONDS + 16 * TICKS) .eut(49152) .metadata(FUSION_THRESHOLD, 200000000) - .addTo(sFusionRecipes); // FT2 - utility + .addTo(fusionRecipes); // FT2 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Plutonium.getMolten(16), Materials.Thorium.getMolten(16)) @@ -106,7 +106,7 @@ public class FusionReactorRecipes implements Runnable { .duration(3 * SECONDS + 4 * TICKS) .eut(TierEU.RECIPE_LuV) .metadata(FUSION_THRESHOLD, 300000000) - .addTo(sFusionRecipes); // FT1+ - utility + .addTo(fusionRecipes); // FT1+ - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Americium.getMolten(144), Materials.Naquadria.getMolten(144)) @@ -114,7 +114,7 @@ public class FusionReactorRecipes implements Runnable { .duration(12 * SECONDS) .eut(TierEU.RECIPE_ZPM) .metadata(FUSION_THRESHOLD, 640000000) - .addTo(sFusionRecipes); // FT3 - utility + .addTo(fusionRecipes); // FT3 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Glowstone.getMolten(16), Materials.Helium.getPlasma(4)) @@ -122,8 +122,8 @@ public class FusionReactorRecipes implements Runnable { .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_IV) .metadata(FUSION_THRESHOLD, 40000000) - .addTo(sFusionRecipes); // Mark 1 Expensive - // // + .addTo(fusionRecipes); // Mark 1 Expensive + // // GT_Values.RA.stdBuilder() .fluidInputs(Materials.Tungsten.getMolten(16), Materials.Helium.getGas(16)) @@ -131,7 +131,7 @@ public class FusionReactorRecipes implements Runnable { .duration(12 * SECONDS + 16 * TICKS) .eut(24578) .metadata(FUSION_THRESHOLD, 150000000) - .addTo(sFusionRecipes); // FT1 - utility + .addTo(fusionRecipes); // FT1 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Manganese.getMolten(16), Materials.Hydrogen.getGas(16)) @@ -139,7 +139,7 @@ public class FusionReactorRecipes implements Runnable { .duration(3 * SECONDS + 4 * TICKS) .eut(8192) .metadata(FUSION_THRESHOLD, 120000000) - .addTo(sFusionRecipes); // FT1 - utility + .addTo(fusionRecipes); // FT1 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Magnesium.getMolten(128), Materials.Oxygen.getGas(128)) @@ -147,7 +147,7 @@ public class FusionReactorRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(8192) .metadata(FUSION_THRESHOLD, 120000000) - .addTo(sFusionRecipes); // + .addTo(fusionRecipes); // GT_Values.RA.stdBuilder() .fluidInputs(Materials.Mercury.getFluid(16), Materials.Magnesium.getMolten(16)) @@ -155,7 +155,7 @@ public class FusionReactorRecipes implements Runnable { .duration(3 * SECONDS + 4 * TICKS) .eut(49152) .metadata(FUSION_THRESHOLD, 240000000) - .addTo(sFusionRecipes); // FT2 - utility + .addTo(fusionRecipes); // FT2 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Gold.getMolten(16), Materials.Aluminium.getMolten(16)) @@ -163,7 +163,7 @@ public class FusionReactorRecipes implements Runnable { .duration(3 * SECONDS + 4 * TICKS) .eut(49152) .metadata(FUSION_THRESHOLD, 240000000) - .addTo(sFusionRecipes); // FT2 - utility + .addTo(fusionRecipes); // FT2 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Uranium.getMolten(16), Materials.Helium.getGas(16)) @@ -171,7 +171,7 @@ public class FusionReactorRecipes implements Runnable { .duration(6 * SECONDS + 8 * TICKS) .eut(49152) .metadata(FUSION_THRESHOLD, 480000000) - .addTo(sFusionRecipes); // FT2+ - utility + .addTo(fusionRecipes); // FT2+ - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Vanadium.getMolten(16), Materials.Hydrogen.getGas(125)) @@ -179,7 +179,7 @@ public class FusionReactorRecipes implements Runnable { .duration(3 * SECONDS + 4 * TICKS) .eut(24576) .metadata(FUSION_THRESHOLD, 140000000) - .addTo(sFusionRecipes); // FT1 - utility + .addTo(fusionRecipes); // FT1 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Gallium.getMolten(16), Materials.Radon.getGas(125)) @@ -187,7 +187,7 @@ public class FusionReactorRecipes implements Runnable { .duration(3 * SECONDS + 4 * TICKS) .eut(16384) .metadata(FUSION_THRESHOLD, 140000000) - .addTo(sFusionRecipes); + .addTo(fusionRecipes); GT_Values.RA.stdBuilder() .fluidInputs(Materials.Titanium.getMolten(48), Materials.Duranium.getMolten(32)) @@ -195,7 +195,7 @@ public class FusionReactorRecipes implements Runnable { .duration(3 * SECONDS + 4 * TICKS) .eut(TierEU.RECIPE_LuV) .metadata(FUSION_THRESHOLD, 200000000) - .addTo(sFusionRecipes); + .addTo(fusionRecipes); GT_Values.RA.stdBuilder() .fluidInputs(Materials.Tantalum.getMolten(16), Materials.Tritium.getGas(16)) @@ -203,7 +203,7 @@ public class FusionReactorRecipes implements Runnable { .duration(16 * TICKS) .eut(24576) .metadata(FUSION_THRESHOLD, 200000000) - .addTo(sFusionRecipes); // + .addTo(fusionRecipes); // GT_Values.RA.stdBuilder() .fluidInputs(Materials.Silver.getMolten(16), Materials.Lithium.getMolten(16)) @@ -211,7 +211,7 @@ public class FusionReactorRecipes implements Runnable { .duration(1 * SECONDS + 12 * TICKS) .eut(24576) .metadata(FUSION_THRESHOLD, 380000000) - .addTo(sFusionRecipes); // + .addTo(fusionRecipes); // GT_Values.RA.stdBuilder() .fluidInputs(Materials.Copper.getMolten(72), Materials.Tritium.getGas(250)) @@ -219,7 +219,7 @@ public class FusionReactorRecipes implements Runnable { .duration(16 * TICKS) .eut(49152) .metadata(FUSION_THRESHOLD, 180000000) - .addTo(sFusionRecipes); // FT2 - farmable + .addTo(fusionRecipes); // FT2 - farmable GT_Values.RA.stdBuilder() .fluidInputs(Materials.Cobalt.getMolten(144), Materials.Silicon.getMolten(144)) @@ -227,7 +227,7 @@ public class FusionReactorRecipes implements Runnable { .duration(16 * TICKS) .eut(49152) .metadata(FUSION_THRESHOLD, 200000000) - .addTo(sFusionRecipes); // FT2 - utility + .addTo(fusionRecipes); // FT2 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Gold.getMolten(144), Materials.Arsenic.getMolten(144)) @@ -235,7 +235,7 @@ public class FusionReactorRecipes implements Runnable { .duration(16 * TICKS) .eut(49152) .metadata(FUSION_THRESHOLD, 350000000) - .addTo(sFusionRecipes); // FT2+ + .addTo(fusionRecipes); // FT2+ GT_Values.RA.stdBuilder() .fluidInputs(Materials.Silver.getMolten(144), Materials.Helium_3.getGas(375)) @@ -243,7 +243,7 @@ public class FusionReactorRecipes implements Runnable { .duration(16 * TICKS) .eut(49152) .metadata(FUSION_THRESHOLD, 280000000) - .addTo(sFusionRecipes); // FT2 + .addTo(fusionRecipes); // FT2 GT_Values.RA.stdBuilder() .fluidInputs(Materials.Tantalum.getMolten(144), Materials.Zinc.getPlasma(72)) @@ -251,7 +251,7 @@ public class FusionReactorRecipes implements Runnable { .duration(16 * TICKS) .eut(98304) .metadata(FUSION_THRESHOLD, 350000000) - .addTo(sFusionRecipes); // FT3 - farmable + .addTo(fusionRecipes); // FT3 - farmable GT_Values.RA.stdBuilder() .fluidInputs(Materials.Iridium.getMolten(144), Materials.Fluorine.getGas(500)) @@ -259,7 +259,7 @@ public class FusionReactorRecipes implements Runnable { .duration(1 * SECONDS + 12 * TICKS) .eut(98304) .metadata(FUSION_THRESHOLD, 450000000) - .addTo(sFusionRecipes); // FT3 - utility + .addTo(fusionRecipes); // FT3 - utility GT_Values.RA.stdBuilder() .fluidInputs(Materials.Plutonium241.getMolten(144), Materials.Hydrogen.getGas(2000)) @@ -267,7 +267,7 @@ public class FusionReactorRecipes implements Runnable { .duration(3 * SECONDS + 4 * TICKS) .eut(98304) .metadata(FUSION_THRESHOLD, 500000000) - .addTo(sFusionRecipes); // FT3 + .addTo(fusionRecipes); // FT3 GT_Values.RA.stdBuilder() .fluidInputs(Materials.Lutetium.getMolten(144), Materials.Vanadium.getMolten(144)) @@ -275,7 +275,7 @@ public class FusionReactorRecipes implements Runnable { .duration(8 * TICKS) .eut(TierEU.RECIPE_UEV / 2) .metadata(FUSION_THRESHOLD, 1_000_000_000) - .addTo(sFusionRecipes); // FT5 because of UEV voltage + .addTo(fusionRecipes); // FT5 because of UEV voltage GT_Values.RA.stdBuilder() .fluidInputs(Materials.Tellurium.getMolten(144), Materials.Zinc.getMolten(144)) @@ -283,7 +283,7 @@ public class FusionReactorRecipes implements Runnable { .duration(8 * TICKS) .eut(TierEU.RECIPE_UEV / 2) .metadata(FUSION_THRESHOLD, 1_000_000_000) - .addTo(sFusionRecipes); // FT5 because of UEV voltage + .addTo(fusionRecipes); // FT5 because of UEV voltage GT_Values.RA.stdBuilder() .fluidInputs(Materials.Osmium.getMolten(144), Materials.Silicon.getMolten(144)) @@ -291,6 +291,6 @@ public class FusionReactorRecipes implements Runnable { .duration(8 * TICKS) .eut(TierEU.RECIPE_UEV / 2) .metadata(FUSION_THRESHOLD, 1_000_000_000) - .addTo(sFusionRecipes); // FT5 because of UEV voltage + .addTo(fusionRecipes); // FT5 because of UEV voltage } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java index e0eaa38a5c..a9764de8c6 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java @@ -2,8 +2,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; +import static gregtech.api.recipe.RecipeMaps.implosionRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sImplosionRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; @@ -28,7 +28,7 @@ public class ImplosionCompressorRecipes implements Runnable { .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 8) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + .addTo(implosionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Ingot_IridiumAlloy.get(1L)) @@ -38,7 +38,7 @@ public class ImplosionCompressorRecipes implements Runnable { .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 8) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + .addTo(implosionRecipes); if (GalacticraftMars.isModLoaded()) { @@ -50,7 +50,7 @@ public class ImplosionCompressorRecipes implements Runnable { .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 8) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + .addTo(implosionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Ingot_Heavy2.get(1L)) @@ -60,7 +60,7 @@ public class ImplosionCompressorRecipes implements Runnable { .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 16) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + .addTo(implosionRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Ingot_Heavy3.get(1L)) @@ -70,7 +70,7 @@ public class ImplosionCompressorRecipes implements Runnable { .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 24) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + .addTo(implosionRecipes); } } @@ -82,6 +82,6 @@ public class ImplosionCompressorRecipes implements Runnable { .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, explosiveAmount) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + .addTo(implosionRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java index d6727644fa..be21c84d66 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes; +import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -20,7 +20,7 @@ public class LaserEngraverRecipes implements Runnable { .duration(41 * MINUTES + 40 * SECONDS) .eut((int) TierEU.RECIPE_ZPM) .noOptimize() - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentProsaicCatalyst.getFluid(1000)) @@ -29,7 +29,7 @@ public class LaserEngraverRecipes implements Runnable { .duration(41 * MINUTES + 40 * SECONDS) .eut((int) TierEU.RECIPE_UV) .noOptimize() - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentResplendentCatalyst.getFluid(1000)) @@ -38,7 +38,7 @@ public class LaserEngraverRecipes implements Runnable { .duration(41 * MINUTES + 40 * SECONDS) .eut((int) TierEU.RECIPE_UHV) .noOptimize() - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000)) @@ -47,7 +47,7 @@ public class LaserEngraverRecipes implements Runnable { .duration(41 * MINUTES + 40 * SECONDS) .eut((int) TierEU.RECIPE_UEV) .noOptimize() - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); GT_Values.RA.stdBuilder() .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentStellarCatalyst.getFluid(1000)) @@ -56,7 +56,7 @@ public class LaserEngraverRecipes implements Runnable { .duration(41 * MINUTES + 40 * SECONDS) .eut((int) TierEU.RECIPE_UIV) .noOptimize() - .addTo(sLaserEngraverRecipes); + .addTo(laserEngraverRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java index 619c261762..4413f61200 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java @@ -1,8 +1,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.recipe.RecipeMaps.latheRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLatheRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -26,7 +26,7 @@ public class LatheRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(8) - .addTo(sLatheRecipes); + .addTo(latheRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Forestry.ID, "slabs", 1L, GT_Values.W)) @@ -35,6 +35,6 @@ public class LatheRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(8) - .addTo(sLatheRecipes); + .addTo(latheRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java index f286e66ab8..863f0ae440 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAmplifiers; +import static gregtech.api.recipe.RecipeMaps.amplifierRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import gregtech.api.enums.GT_Values; @@ -17,13 +17,13 @@ public class MatterAmplifierRecipes implements Runnable { .fluidOutputs(Materials.UUAmplifier.getFluid(1)) .duration(9 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAmplifiers); + .addTo(amplifierRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Scrapbox.get(1L)) .fluidOutputs(Materials.UUAmplifier.getFluid(1)) .duration(9 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sAmplifiers); + .addTo(amplifierRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index fbb87a941c..fd315542e5 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -7,8 +7,8 @@ import static gregtech.api.enums.Mods.Natura; import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -48,7 +48,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.EnderEye, OrePrefixes.dust.mMaterialAmount)) .duration(5 * SECONDS) .eut(48) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -58,7 +58,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Electrum, 2L * OrePrefixes.dust.mMaterialAmount)) .duration(10 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -68,7 +68,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Invar, 3L * OrePrefixes.dust.mMaterialAmount)) .duration(15 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -80,7 +80,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.StainlessSteel, 9L * OrePrefixes.dust.mMaterialAmount)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -91,7 +91,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Kanthal, 3L * OrePrefixes.dust.mMaterialAmount)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -101,7 +101,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Brass, 4L * OrePrefixes.dust.mMaterialAmount)) .duration(2 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -111,7 +111,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Bronze, 4L * OrePrefixes.dust.mMaterialAmount)) .duration(2 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -121,7 +121,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Cupronickel, 2L * OrePrefixes.dust.mMaterialAmount)) .duration(10 * SECONDS) .eut(24) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -131,7 +131,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.SterlingSilver, 5L * OrePrefixes.dust.mMaterialAmount)) .duration(25 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -141,7 +141,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlackBronze, 5L * OrePrefixes.dust.mMaterialAmount)) .duration(25 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -151,7 +151,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.BismuthBronze, 5L * OrePrefixes.dust.mMaterialAmount)) .duration(25 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -162,7 +162,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlackSteel, 5L * OrePrefixes.dust.mMaterialAmount)) .duration(25 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -174,7 +174,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.RedSteel, 8L * OrePrefixes.dust.mMaterialAmount)) .duration(40 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -186,7 +186,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlueSteel, 8L * OrePrefixes.dust.mMaterialAmount)) .duration(40 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -199,7 +199,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlackSteel, 25L * OrePrefixes.dust.mMaterialAmount)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -213,7 +213,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.RedSteel, 40L * OrePrefixes.dust.mMaterialAmount)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -230,7 +230,7 @@ public class MixerRecipes implements Runnable { GT_OreDictUnificator.getDust(Materials.BlueSteel, 32L * OrePrefixes.dust.mMaterialAmount)) .duration(3 * MINUTES) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -242,7 +242,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Ultimet, 9L * OrePrefixes.dust.mMaterialAmount)) .duration(45 * SECONDS) .eut(500) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -253,7 +253,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.CobaltBrass, 9L * OrePrefixes.dust.mMaterialAmount)) .duration(45 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -264,7 +264,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount)) .duration(30 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -275,7 +275,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount)) .duration(30 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -286,7 +286,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount)) .duration(30 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -298,7 +298,7 @@ public class MixerRecipes implements Runnable { GT_OreDictUnificator.getDust(Materials.IndiumGalliumPhosphide, 3L * OrePrefixes.dust.mMaterialAmount)) .duration(10 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -307,7 +307,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Fireclay, 2L * OrePrefixes.dust.mMaterialAmount)) .duration(10 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -317,7 +317,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Nichrome, 5L * OrePrefixes.dust.mMaterialAmount)) .duration(25 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -327,7 +327,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.Osmiridium, 4L * OrePrefixes.dust.mMaterialAmount)) .duration(2 * SECONDS) .eut(2000) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -337,7 +337,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.NiobiumTitanium, 2L * OrePrefixes.dust.mMaterialAmount)) .duration(10 * SECONDS) .eut(2000) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -347,7 +347,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.VanadiumGallium, 4L * OrePrefixes.dust.mMaterialAmount)) .duration(2 * SECONDS) .eut(2000) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -357,7 +357,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.TungstenCarbide, 2L * OrePrefixes.dust.mMaterialAmount)) .duration(10 * SECONDS) .eut(500) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -367,7 +367,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.TungstenSteel, 2L * OrePrefixes.dust.mMaterialAmount)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -378,7 +378,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.TPV, 7L * OrePrefixes.dust.mMaterialAmount)) .duration(8 * SECONDS + 15 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -390,7 +390,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSG, 9L * OrePrefixes.dust.mMaterialAmount)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -402,7 +402,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSE, 9L * OrePrefixes.dust.mMaterialAmount)) .duration(35 * SECONDS) .eut(4096) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -413,7 +413,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSS, 9L * OrePrefixes.dust.mMaterialAmount)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -424,7 +424,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.getDust(Materials.FerriteMixture, 6L * OrePrefixes.dust.mMaterialAmount)) .duration(10 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -434,7 +434,7 @@ public class MixerRecipes implements Runnable { GT_OreDictUnificator.getDust(Materials.BorosilicateGlass, 8L * OrePrefixes.dust.mMaterialAmount)) .duration(10 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -447,7 +447,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(getFluidStack("sludge", 1000)) .duration(6 * SECONDS + 8 * TICKS) .eut(24) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1)) @@ -455,7 +455,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(1000)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -464,7 +464,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(ItemList.Food_ChiliChips.get(1)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -473,7 +473,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(ItemList.IC2_Energium_Dust.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -482,7 +482,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(ItemList.IC2_Energium_Dust.get(9)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -492,7 +492,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(new ItemStack(Items.fermented_spider_eye, 1)) .duration(5 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -502,7 +502,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 2)) .duration(5 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -512,7 +512,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 18)) .duration(45 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -523,7 +523,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(500)) .duration(20 * TICKS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -534,7 +534,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(GT_ModHandler.getDistilledWater(500)) .duration(20 * TICKS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -545,7 +545,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(1000)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -556,7 +556,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(1000)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -567,7 +567,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(1000)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -578,7 +578,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(1000)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -589,7 +589,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(250)) .duration(16 * TICKS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -598,7 +598,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6)) .duration(16 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -609,7 +609,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.HeavyFuel.getFluid(1000)) .duration(16 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -620,7 +620,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.LightFuel.getFluid(5000)) .duration(16 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -631,7 +631,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.Fuel.getFluid(6000)) .duration(16 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -642,7 +642,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.Fuel.getFluid(6000)) .duration(16 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -653,7 +653,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(new FluidStack(ItemList.sDrillingFluid, 5000)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -663,7 +663,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(getFluidStack("ic2coolant", 125)) .duration(12 * SECONDS + 16 * TICKS) .eut(48) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -673,7 +673,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(getFluidStack("ic2coolant", 1000)) .duration(12 * SECONDS + 16 * TICKS) .eut(48) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -685,7 +685,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.AdvancedGlue.getFluid(200)) .duration(40 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -697,7 +697,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.AdvancedGlue.getFluid(200)) .duration(40 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -709,7 +709,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.AdvancedGlue.getFluid(200)) .duration(40 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -721,7 +721,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.McGuffium239.getFluid(12)) .duration(20 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -733,7 +733,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.McGuffium239.getFluid(8)) .duration(20 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -745,7 +745,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.McGuffium239.getFluid(4)) .duration(20 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.SFMixture.get(2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderEye, 1)) @@ -753,7 +753,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Mercury.getFluid(1000)) .duration(15 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.SFMixture.get(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1)) @@ -761,7 +761,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Mercury.getFluid(500)) .duration(15 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -773,7 +773,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(4000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -785,7 +785,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(3000)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -797,7 +797,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(2000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -809,7 +809,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(1600)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -821,7 +821,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(1200)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -833,7 +833,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(800)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); if (Thaumcraft.isModLoaded()) { GT_Values.RA.stdBuilder() @@ -845,7 +845,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.FierySteel.getFluid(50)) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -856,7 +856,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.FierySteel.getFluid(50)) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -867,7 +867,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.FierySteel.getFluid(50)) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -878,7 +878,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.FierySteel.getFluid(50)) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -889,7 +889,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.FierySteel.getFluid(50)) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -900,7 +900,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.FierySteel.getFluid(50)) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); FluidStack tFD = getFluidStack("fluiddeath", 30); if (tFD != null && tFD.getFluid() != null && tFD.amount > 0) { @@ -913,7 +913,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(tFD) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -924,7 +924,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(tFD) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -935,7 +935,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(tFD) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -946,7 +946,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(tFD) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -957,7 +957,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(tFD) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -968,7 +968,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(tFD) .duration(10 * SECONDS) .eut(64) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -980,7 +980,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(1000)) .duration(7 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -992,7 +992,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(750)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1004,7 +1004,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(500)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1016,7 +1016,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(400)) .duration(7 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1028,7 +1028,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(300)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1040,7 +1040,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(200)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); } } @@ -1053,7 +1053,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(1000)) .duration(7 * SECONDS) .eut(250) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1064,7 +1064,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(750)) .duration(6 * SECONDS) .eut(250) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1075,7 +1075,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(500)) .duration(5 * SECONDS) .eut(250) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1086,7 +1086,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(400)) .duration(7 * SECONDS) .eut(250) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1097,7 +1097,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(300)) .duration(6 * SECONDS) .eut(250) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1108,7 +1108,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(200)) .duration(5 * SECONDS) .eut(250) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1119,7 +1119,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(new FluidStack(ItemList.sNitrationMixture, 2000)) .duration(24 * SECONDS) .eut(2) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1129,7 +1129,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrationMixture, 2)) .duration(24 * SECONDS) .eut(2) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1140,7 +1140,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1151,7 +1151,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1162,7 +1162,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1173,7 +1173,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1184,7 +1184,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1195,7 +1195,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1206,7 +1206,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1217,7 +1217,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1228,7 +1228,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1239,7 +1239,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1250,7 +1250,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1261,7 +1261,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1272,7 +1272,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1283,7 +1283,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Water.getFluid(100)) .duration(10 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); // radiation manufacturing @@ -1293,7 +1293,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.Helium.getGas(250)) .duration(1 * SECONDS + 10 * TICKS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(MaterialsOreAlum.SluiceSand.getDust(1)) @@ -1301,7 +1301,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(1000)) .duration(5 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); // NaCl + H2O = (NaCl·H2O) @@ -1311,7 +1311,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.SaltWater.getFluid(1000)) .duration(5 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); // CaCO3 + 2 CH3COOH = Ca(CH3COO)2 + H2O + CO2 @@ -1322,7 +1322,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)) .duration(12 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(2), GT_Utility.getIntegratedCircuit(11)) @@ -1331,7 +1331,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(1000)) .duration(12 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(2), GT_Utility.getIntegratedCircuit(21)) @@ -1340,7 +1340,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) .duration(12 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(4)) @@ -1349,7 +1349,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)) .duration(12 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(14)) @@ -1358,7 +1358,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) .duration(12 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); // Ca + 2 CH3COOH = Ca(CH3COO)2 + 2H @@ -1369,7 +1369,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)) .duration(4 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Calcium.getDust(1), Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(11)) @@ -1378,7 +1378,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.Hydrogen.getGas(2000)) .duration(4 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); // CaO + 2 CH3COOH = Ca(CH3COO)2 + H2O @@ -1389,7 +1389,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)) .duration(4 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1401,7 +1401,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(1000)) .duration(4 * SECONDS) .eut(16) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); // 2CH3COOCH3 + 3CH3COCH3/(C4H6O2)n = 5Glue @@ -1412,7 +1412,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)) .duration(5 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.PolyvinylAcetate.getCells(2)) @@ -1421,7 +1421,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)) .duration(5 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.MethylAcetate.getCells(3)) @@ -1430,7 +1430,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)) .duration(5 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.PolyvinylAcetate.getCells(2)) @@ -1439,7 +1439,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)) .duration(5 * SECONDS) .eut(8) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Sugar.getDust(4)) @@ -1448,7 +1448,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) .duration(60 * SECONDS) .eut(2) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Wood.getDust(4)) @@ -1457,7 +1457,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) .duration(60 * SECONDS) .eut(2) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Fuel.getCells(1)) @@ -1466,7 +1466,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.NitroFuel.getFluid(1000)) .duration(20 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.BioDiesel.getCells(1)) @@ -1475,7 +1475,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.NitroFuel.getFluid(900)) .duration(20 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); // CH4O + C4H8 = C5H12O @@ -1484,7 +1484,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(Materials.MTBEMixture.getCells(1), Materials.Empty.getCells(1)) .duration(20 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1495,7 +1495,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(Materials.GasolineRaw.getCells(20)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1508,7 +1508,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.GasolinePremium.getFluid(32000)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); if (Railcraft.isModLoaded()) { GT_Values.RA.stdBuilder() @@ -1520,7 +1520,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(300)) .duration(5 * SECONDS) .eut(250) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1531,7 +1531,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(120)) .duration(5 * SECONDS) .eut(250) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); } if (Thaumcraft.isModLoaded() && Railcraft.isModLoaded()) { @@ -1545,7 +1545,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.NitroFuel.getFluid(300)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1557,7 +1557,7 @@ public class MixerRecipes implements Runnable { .fluidInputs(Materials.GasolinePremium.getFluid(120)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); } } @@ -1576,7 +1576,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".splash"), 750)) .duration(10 * SECONDS) .eut(24) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); if (splashStrong) GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1)) @@ -1584,7 +1584,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".strong.splash"), 750)) .duration(10 * SECONDS) .eut(24) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); if (splashLong) GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1)) @@ -1592,7 +1592,7 @@ public class MixerRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".long.splash"), 750)) .duration(10 * SECONDS) .eut(24) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); } public void registerSingleBlockAndMulti() { @@ -1604,7 +1604,7 @@ public class MixerRecipes implements Runnable { .itemOutputs(Materials.EnrichedHolmium.getDust(10)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); // Catalysts for Plasma Forge. { @@ -1619,7 +1619,7 @@ public class MixerRecipes implements Runnable { .duration(41 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_ZPM) .noOptimize() - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(10)) @@ -1633,7 +1633,7 @@ public class MixerRecipes implements Runnable { .duration(41 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UV) .noOptimize() - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(11)) @@ -1647,7 +1647,7 @@ public class MixerRecipes implements Runnable { .duration(41 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UHV) .noOptimize() - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(12)) @@ -1661,7 +1661,7 @@ public class MixerRecipes implements Runnable { .duration(41 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UEV) .noOptimize() - .addTo(sMixerRecipes); + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(13)) @@ -1675,7 +1675,7 @@ public class MixerRecipes implements Runnable { .duration(41 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UIV) .noOptimize() - .addTo(sMixerRecipes); + .addTo(mixerRecipes); } GT_Values.RA.stdBuilder() @@ -1684,6 +1684,6 @@ public class MixerRecipes implements Runnable { .fluidOutputs(Materials.WeedEX9000.getFluid(750)) .duration(5 * SECONDS) .eut(100) - .addTo(sMixerRecipes); + .addTo(mixerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java index d4e84e91e7..bb434cbf7d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes; +import static gregtech.api.recipe.RecipeMaps.packagerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -19,7 +19,7 @@ public class PackagerRecipes implements Runnable { .itemOutputs(ItemList.IC2_Scrapbox.get(1)) .duration(16 * TICKS) .eut(1) - .addTo(sBoxinatorRecipes); + .addTo(packagerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -28,7 +28,7 @@ public class PackagerRecipes implements Runnable { .itemOutputs(ItemList.Food_Packaged_Fries.get(1)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) - .addTo(sBoxinatorRecipes); + .addTo(packagerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -37,7 +37,7 @@ public class PackagerRecipes implements Runnable { .itemOutputs(ItemList.Food_Packaged_PotatoChips.get(1)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) - .addTo(sBoxinatorRecipes); + .addTo(packagerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -46,6 +46,6 @@ public class PackagerRecipes implements Runnable { .itemOutputs(ItemList.Food_Packaged_ChiliChips.get(1)) .duration(3 * SECONDS + 4 * TICKS) .eut(16) - .addTo(sBoxinatorRecipes); + .addTo(packagerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java index cb67c043ba..fe0f7c7ed5 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java @@ -3,8 +3,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.recipe.RecipeMaps.plasmaForgeRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPlasmaForgeRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; @@ -31,7 +31,7 @@ public class PlasmaForgeRecipes implements Runnable { .duration(86400 * 20 * 2) .eut(2_000_000_000) .metadata(COIL_HEAT, 13500) - .addTo(sPlasmaForgeRecipes); + .addTo(plasmaForgeRecipes); // Quantum anomaly recipe bypass for UEV+. Avoids RNG. GT_Values.RA.stdBuilder() @@ -45,6 +45,6 @@ public class PlasmaForgeRecipes implements Runnable { .duration(60 * SECONDS) .eut((int) TierEU.RECIPE_UEV) .metadata(COIL_HEAT, 10800) - .addTo(sPlasmaForgeRecipes); + .addTo(plasmaForgeRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java index 7fc192025c..e8a52dd1f8 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPrinterRecipes; +import static gregtech.api.recipe.RecipeMaps.printerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; @@ -24,7 +24,7 @@ public class PrinterRecipes implements Runnable { .fluidInputs(getFluidStack("squidink", 36)) .duration(5 * SECONDS) .eut(2) - .addTo(sPrinterRecipes); + .addTo(printerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Paper_Punch_Card_Empty.get(1L)) @@ -33,7 +33,7 @@ public class PrinterRecipes implements Runnable { .fluidInputs(getFluidStack("squidink", 36)) .duration(5 * SECONDS) .eut(2) - .addTo(sPrinterRecipes); + .addTo(printerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3L)) @@ -42,7 +42,7 @@ public class PrinterRecipes implements Runnable { .fluidInputs(getFluidStack("squidink", 144)) .duration(20 * SECONDS) .eut(2) - .addTo(sPrinterRecipes); + .addTo(printerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.map, 1, 32767)) @@ -51,7 +51,7 @@ public class PrinterRecipes implements Runnable { .fluidInputs(getFluidStack("squidink", 144)) .duration(20 * SECONDS) .eut(2) - .addTo(sPrinterRecipes); + .addTo(printerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.book, 1, 32767)) @@ -59,6 +59,6 @@ public class PrinterRecipes implements Runnable { .fluidInputs(getFluidStack("squidink", 144)) .duration(20 * SECONDS) .eut(2) - .addTo(sPrinterRecipes); + .addTo(printerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java index 162c7d72f2..180e751d35 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java +++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java @@ -4,8 +4,8 @@ import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -32,7 +32,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 19)) .duration(15 * SECONDS) .eut(4) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1)) @@ -41,14 +41,14 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 7)) .duration(15 * SECONDS) .eut(4) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 2)) .duration(10 * TICKS) .eut(4) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(1)) @@ -57,7 +57,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 1)) .duration(10 * TICKS) .eut(4) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); } // marbe dust( stone dust @@ -66,21 +66,21 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Marble, 1)) .duration(8 * SECONDS) .eut(4) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 18)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1)) .duration(1 * SECONDS + 1 * TICKS) .eut(4) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.reeds, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Cupronickel.get(1)) @@ -90,7 +90,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 2)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Kanthal.get(1)) @@ -100,7 +100,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 3)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Nichrome.get(1)) @@ -110,7 +110,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 4)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_TungstenSteel.get(1)) @@ -120,7 +120,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 5)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_HSSG.get(1)) @@ -130,7 +130,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 6)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_HSSS.get(1)) @@ -140,7 +140,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 7)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Naquadah.get(1)) @@ -150,7 +150,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 8)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_NaquadahAlloy.get(1)) @@ -160,7 +160,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 9)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Trinium.get(1)) @@ -170,7 +170,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 10)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_ElectrumFlux.get(1)) @@ -180,7 +180,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 11)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_AwakenedDraconium.get(1)) @@ -190,7 +190,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 12)) .duration(1 * MINUTES + 15 * SECONDS) .eut(80) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); if (Railcraft.isModLoaded()) { // recycling RC Tanks @@ -201,7 +201,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2)) .duration(15 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1)) @@ -210,7 +210,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(15 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) @@ -219,7 +219,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3)) .duration(15 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); // Steel @@ -228,7 +228,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2)) .duration(15 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14)) @@ -237,7 +237,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(15 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) @@ -246,7 +246,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3)) .duration(15 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); // Aluminium @@ -255,7 +255,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2)) .duration(22 * SECONDS + 10 * TICKS) .eut(8) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1)) @@ -264,7 +264,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(22 * SECONDS + 10 * TICKS) .eut(8) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) @@ -273,7 +273,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3)) .duration(22 * SECONDS + 10 * TICKS) .eut(8) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); // Stainless Steel @@ -282,7 +282,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2)) .duration(30 * SECONDS) .eut(16) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4)) @@ -291,7 +291,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(30 * SECONDS) .eut(16) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) @@ -300,7 +300,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3)) .duration(30 * SECONDS) .eut(16) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); // Titanium @@ -309,7 +309,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2)) .duration(30 * SECONDS) .eut(30) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7)) @@ -318,7 +318,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(30 * SECONDS) .eut(30) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) @@ -327,7 +327,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3)) .duration(30 * SECONDS) .eut(30) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); // Tungesten Steel @@ -336,7 +336,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2)) .duration(30 * SECONDS) .eut(30) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10)) @@ -345,7 +345,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(30 * SECONDS) .eut(30) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) @@ -354,7 +354,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3)) .duration(30 * SECONDS) .eut(30) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); // Palladium @@ -363,7 +363,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2)) .duration(37 * SECONDS + 10 * TICKS) .eut(64) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13)) @@ -372,7 +372,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(37 * SECONDS + 10 * TICKS) .eut(64) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) @@ -381,7 +381,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3)) .duration(37 * SECONDS + 10 * TICKS) .eut(64) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); // Iridium @@ -390,7 +390,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1)) @@ -399,7 +399,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) @@ -408,7 +408,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); // Osmium @@ -417,7 +417,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2)) .duration(52 * SECONDS + 10 * TICKS) .eut(256) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4)) @@ -426,7 +426,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(52 * SECONDS + 10 * TICKS) .eut(256) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) @@ -435,7 +435,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3)) .duration(52 * SECONDS + 10 * TICKS) .eut(256) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); // Neutronium @@ -444,7 +444,7 @@ public class Pulverizer implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7)) @@ -453,7 +453,7 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) @@ -462,14 +462,14 @@ public class Pulverizer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "cube.crushed.obsidian", 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); } if (AppliedEnergistics2.isModLoaded()) { @@ -478,14 +478,14 @@ public class Pulverizer implements Runnable { .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 45)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(AppliedEnergistics2.ID, "tile.BlockSkyChest", 1L, 32767)) .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 45)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); } GT_Values.RA.stdBuilder() @@ -494,7 +494,7 @@ public class Pulverizer implements Runnable { .outputChances(10000, 5000) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.web, 1, 0)) @@ -502,14 +502,14 @@ public class Pulverizer implements Runnable { .outputChances(10000, 5000) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 32767)) .itemOutputs(ItemList.IC2_Grin_Powder.get(1L)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.item_frame, 1, 32767)) @@ -519,7 +519,7 @@ public class Pulverizer implements Runnable { .outputChances(10000, 9500) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.bow, 1, 0)) @@ -529,49 +529,49 @@ public class Pulverizer implements Runnable { .outputChances(10000, 9500) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Brick.getIngots(1)) .itemOutputs(Materials.Brick.getDustSmall(1)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.brick_stairs, 1, 0)) .itemOutputs(Materials.Brick.getDustSmall(6)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.CompressedFireclay.get(1)) .itemOutputs(Materials.Fireclay.getDustSmall(1)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Firebrick.get(1)) .itemOutputs(Materials.Brick.getDust(1)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Firebricks.get(1)) .itemOutputs(Materials.Brick.getDust(4)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Machine_Bricked_BlastFurnace.get(1)) .itemOutputs(Materials.Brick.getDust(8), Materials.Iron.getDust(1)) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); if (HardcoreEnderExpansion.isModLoaded()) { GT_Values.RA.stdBuilder() @@ -582,7 +582,7 @@ public class Pulverizer implements Runnable { .outputChances(10000, 5000) .duration(20 * SECONDS) .eut(2) - .addTo(sMaceratorRecipes); + .addTo(maceratorRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java index d465f0f33c..51017358b4 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java @@ -2,8 +2,8 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPyrolyseRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -32,7 +32,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.Creosote.getFluid(8000)) .duration(32 * SECONDS) .eut(64) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -43,7 +43,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.Creosote.getFluid(8000)) .duration(16 * SECONDS) .eut(96) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -53,7 +53,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.Creosote.getFluid(32000)) .duration(2 * MINUTES + 8 * SECONDS) .eut(64) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -64,7 +64,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.Creosote.getFluid(32000)) .duration(1 * MINUTES + 4 * SECONDS) .eut(96) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); } if (Forestry.isModLoaded()) { @@ -74,7 +74,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.Biomass.getFluid(5000)) .duration(45 * SECONDS) .eut(10) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Forestry.ID, "mulch", 32), GT_Utility.getIntegratedCircuit(1)) @@ -82,7 +82,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.Biomass.getFluid(5000)) .duration(45 * SECONDS) .eut(10) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); } GT_Values.RA.stdBuilder() @@ -91,7 +91,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5000)) .duration(45 * SECONDS) .eut(10) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("biochaff", 1), GT_Utility.getIntegratedCircuit(2)) @@ -99,7 +99,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.FermentedBiomass.getFluid(1500)) .duration(10 * SECONDS) .eut(10) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -107,7 +107,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.FermentedBiomass.getFluid(1000)) .duration(5 * SECONDS) .eut(10) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -115,7 +115,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.FermentedBiomass.getFluid(1000)) .duration(5 * SECONDS) .eut(10) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Sugar.getDust(23), GT_Utility.getIntegratedCircuit(1)) @@ -123,7 +123,7 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(1500)) .duration(16 * SECONDS) .eut(64) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Sugar.getDust(23), GT_Utility.getIntegratedCircuit(2)) @@ -132,6 +132,6 @@ public class PyrolyseRecipes implements Runnable { .fluidOutputs(Materials.Water.getFluid(1500)) .duration(8 * SECONDS) .eut(96) - .addTo(sPyrolyseRecipes); + .addTo(pyrolyseRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java index 183583763f..8d3614d76a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sSifterRecipes; +import static gregtech.api.recipe.RecipeMaps.sifterRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.init.Blocks; @@ -28,7 +28,7 @@ public class SifterRecipes implements Runnable { .outputChances(10000, 9000, 8000, 6000, 3300, 2500) .duration(30 * SECONDS) .eut(16) - .addTo(sSifterRecipes); + .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Coal, 1L)) @@ -42,6 +42,6 @@ public class SifterRecipes implements Runnable { .outputChances(10000, 9000, 8000, 7000, 6000, 5000) .duration(30 * SECONDS) .eut(16) - .addTo(sSifterRecipes); + .addTo(sifterRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java index 2db50141b6..73d251014e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sSlicerRecipes; +import static gregtech.api.recipe.RecipeMaps.slicerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -16,27 +16,27 @@ public class SlicerRecipes implements Runnable { .itemOutputs(ItemList.Food_Raw_Cookie.get(4)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sSlicerRecipes); + .addTo(slicerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Baked_Bun.get(1), ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Bun.get(2)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sSlicerRecipes); + .addTo(slicerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Baked_Bread.get(1), ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Bread.get(2)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sSlicerRecipes); + .addTo(slicerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Baked_Baguette.get(1), ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Baguette.get(2)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(sSlicerRecipes); + .addTo(slicerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java index 597cde3825..7e10d2a1fc 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes; +import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.init.Items; @@ -25,6 +25,6 @@ public class ThermalCentrifugeRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1)) .duration(25 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sThermalCentrifugeRecipes); + .addTo(thermalCentrifugeRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java index 058ab39279..123f9903ea 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sTranscendentPlasmaMixerRecipes; +import static gregtech.api.recipe.RecipeMaps.transcendentPlasmaMixerRecipes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -31,7 +31,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { .duration(100) .eut(CRUDE_EU_PER_L) .noOptimize() - .addTo(sTranscendentPlasmaMixerRecipes); + .addTo(transcendentPlasmaMixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(2)) @@ -48,7 +48,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { .duration(100) .eut(PROSAIC_EU_PER_L) .noOptimize() - .addTo(sTranscendentPlasmaMixerRecipes); + .addTo(transcendentPlasmaMixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(3)) @@ -69,7 +69,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { .duration(100) .eut(RESPLENDENT_EU_PER_L) .noOptimize() - .addTo(sTranscendentPlasmaMixerRecipes); + .addTo(transcendentPlasmaMixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(4)) @@ -94,7 +94,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { .duration(100) .eut(EXOTIC_EU_PER_L) .noOptimize() - .addTo(sTranscendentPlasmaMixerRecipes); + .addTo(transcendentPlasmaMixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(5)) @@ -123,7 +123,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { .duration(200) .eut(STELLAR_EU_PER_HALF_L) .noOptimize() - .addTo(sTranscendentPlasmaMixerRecipes); + .addTo(transcendentPlasmaMixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -136,7 +136,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { .duration(100) .eut(PRIMORDIAL_MATTER) .noOptimize() - .addTo(sTranscendentPlasmaMixerRecipes); + .addTo(transcendentPlasmaMixerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index 400ffcbc44..444db30889 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes; +import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -32,28 +32,28 @@ public class VacuumFreezerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitch", 1L, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchCore", 1L, 32767)) .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchCore", 1L, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchSpread", 1L, 32767)) .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchSpread", 1L, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 32767)) .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); } // reactor vent @@ -63,28 +63,28 @@ public class VacuumFreezerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("reactorVent", 1L, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("reactorVentCore", 1L, 32767)) .itemOutputs(GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("reactorVentGold", 1L, 32767)) .itemOutputs(GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 32767)) .itemOutputs(GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); } // reactor vent spread @@ -93,7 +93,7 @@ public class VacuumFreezerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("reactorVentSpread", 1L, 0)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); // reactor coolant { @@ -103,98 +103,98 @@ public class VacuumFreezerRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1)) .duration(10 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("reactorCoolantTriple", 1L, 32767)) .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantTriple", 1L, 1)) .duration(1 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("reactorCoolantSix", 1L, 32767)) .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantSix", 1L, 1)) .duration(3 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_He_1.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_He_1.get(1L)) .duration(3 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_He_3.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_He_3.get(1L)) .duration(9 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_He_6.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_He_6.get(1L)) .duration(18 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_NaK_1.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_NaK_1.get(1L)) .duration(3 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_NaK_3.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_NaK_3.get(1L)) .duration(9 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_NaK_6.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_NaK_6.get(1L)) .duration(18 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.neutroniumHeatCapacitor.getWildcard(1L)) .itemOutputs(ItemList.neutroniumHeatCapacitor.get(1L)) .duration(13 * HOURS + 53 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_Sp_1.get(1L)) .duration(9 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_Sp_2.get(1L)) .duration(18 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_Sp_3.get(1L)) .duration(27 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_Sp_6.get(1L)) .duration(54 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); } } @@ -206,56 +206,56 @@ public class VacuumFreezerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_HV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_HV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("airCell", 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L)) .duration(1 * SECONDS + 8 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_Sp_1.get(1L)) .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_Sp_2.get(1L)) .duration(3 * MINUTES) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_Sp_3.get(1L)) .duration(4 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L)) .itemOutputs(ItemList.Reactor_Coolant_Sp_6.get(1L)) .duration(9 * MINUTES) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); } // Freeze superconductors. @@ -265,7 +265,7 @@ public class VacuumFreezerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Pentacadmiummagnesiumhexaoxid, 1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -274,21 +274,21 @@ public class VacuumFreezerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titaniumonabariumdecacoppereikosaoxid, 1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Uraniumtriplatinid, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Uraniumtriplatinid, 1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Vanadiumtriindinid, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Vanadiumtriindinid, 1L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -303,7 +303,7 @@ public class VacuumFreezerRecipes implements Runnable { 1L)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -313,7 +313,7 @@ public class VacuumFreezerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 1L)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -322,7 +322,7 @@ public class VacuumFreezerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Longasssuperconductornameforuvwire, 1L)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_UV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -331,28 +331,28 @@ public class VacuumFreezerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Longasssuperconductornameforuhvwire, 1L)) .duration(1 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_UHV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUEVBase, 1L)) .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UEV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUIVBase, 1L)) .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UIV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUMVBase, 1L)) .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UMV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); } // Plasma Freezing @@ -362,42 +362,42 @@ public class VacuumFreezerRecipes implements Runnable { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Americium, 1L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LuV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L)) .duration(5 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Nitrogen, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L)) .duration(1 * SECONDS + 8 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Oxygen, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Radon, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L)) .duration(5 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); GT_Values.RA.stdBuilder() .fluidInputs(Materials.Boron.getPlasma(144L)) .fluidOutputs(Materials.Boron.getMolten(144L)) .duration(1 * SECONDS) .eut(12) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); } if (GTPlusPlus.isModLoaded()) { @@ -410,7 +410,7 @@ public class VacuumFreezerRecipes implements Runnable { Materials.SuperCoolant.getFluid(1000)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_UIV) - .addTo(sVacuumRecipes); + .addTo(vacuumFreezerRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java index ec391e748b..017a8e6582 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sWiremillRecipes; +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_RecipeRegistrator.registerWiremillRecipes; @@ -31,14 +31,14 @@ public class WiremillRecipes implements Runnable { .itemOutputs(new ItemStack(Items.string, 32)) .duration(4 * SECONDS) .eut(48) - .addTo(sWiremillRecipes); + .addTo(wiremillRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Steel, 1)) .itemOutputs(GT_ModHandler.getIC2Item("miningPipe", 1)) .duration(10 * SECONDS) .eut(16) - .addTo(sWiremillRecipes); + .addTo(wiremillRecipes); if (!GT_Mod.gregtechproxy.mDisableIC2Cables) { GT_Values.RA.stdBuilder() @@ -46,42 +46,42 @@ public class WiremillRecipes implements Runnable { .itemOutputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)) .duration(5 * SECONDS) .eut(2) - .addTo(sWiremillRecipes); + .addTo(wiremillRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnnealedCopper, 1L)) .itemOutputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)) .duration(5 * SECONDS) .eut(2) - .addTo(sWiremillRecipes); + .addTo(wiremillRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 1L)) .itemOutputs(GT_ModHandler.getIC2Item("tinCableItem", 4L)) .duration(7 * SECONDS + 10 * TICKS) .eut(1) - .addTo(sWiremillRecipes); + .addTo(wiremillRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L)) .itemOutputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)) .duration(10 * SECONDS) .eut(2) - .addTo(sWiremillRecipes); + .addTo(wiremillRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L)) .itemOutputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)) .duration(10 * SECONDS) .eut(2) - .addTo(sWiremillRecipes); + .addTo(wiremillRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) .itemOutputs(GT_ModHandler.getIC2Item("goldCableItem", 6L)) .duration(10 * SECONDS) .eut(1) - .addTo(sWiremillRecipes); + .addTo(wiremillRecipes); } } } |