diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2023-01-25 05:22:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 05:22:14 +0000 |
| commit | d9f473283fa606662f57bbafdd49be37728b0eb0 (patch) | |
| tree | 3797db9d52f714a5686675ba8a4b5d67c4ce6680 /src/main/java/gregtech/loaders/postload | |
| parent | e197a79a0558c6ce1b116d871a71a214962a01a3 (diff) | |
| download | GT5-Unofficial-d9f473283fa606662f57bbafdd49be37728b0eb0.tar.gz GT5-Unofficial-d9f473283fa606662f57bbafdd49be37728b0eb0.tar.bz2 GT5-Unofficial-d9f473283fa606662f57bbafdd49be37728b0eb0.zip | |
EOH materials + Allow materials to pick their processing tier (#1671)
* Begin addition of tiered material manipulation
* Dwarf matter
* Add hardcoded EU tiers for wider usage.
* New material images etc
* Nugget processing tiers
* Move iron nugget to wrought iron smelting to the correct place
* Add white dwarf shapes
* Add white dwarf shapes
* Additional retiering options for EU consumption on material part generation
* White dwarf matter complete
* Tier neutronium processing at ZPM
* Spotless
* More adjustments
* Renaming files
* Add new overlays for magneto material and more name adjustments
* Add no recipes subtag
* Spotless + name adjustment
* Undo isCustom to maintain potential public variable references in addons.
* Undo isCustom to maintain potential public variable references in addons.
* Fix fluid registry corruption.
* Add rotor EU override
* Add rotor EU override
* Make neutronium mass more reasonable
* Add proper time adjustments to rotor (probably an old oversight)
* Adjust enums to use VP rather than recalculate
* Fix typos on EU usage
* spotlessApply (#1672)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Change setProcessingMaterialTierEU to accept long.
* Small fix
* Add space and time materials
* Add new forge hammer support
* Update tooltip
* Expand laser engraver slots.
* spotlessApply (#1673)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Reserve texture page.
* Modernise GT circuit usage
* Add oversight in assembler frame recipe
* Add missing MHDCSM overlay textures
* Remove small and tiny MHDCSM dusts
* Fix error in ingot texture
* Fix NO_RECIPES not applying to frame boxes
* Restore missing ingot
* Add rod handles for materials
* Fix frame box auto generating with NO_RECIPEs tag
* recipe
* Spotless
* Add MOD_ID_GTPP as modid
* spotlessApply (#1675)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Remove smelting spacetime from furnace (why does this exist?)
* Recipes + new storage blocks for materials
* Bedrockium LuV -> EV
* SpaceTime UMV -> UIV
* TranscendentMetal UIV -> UEV
* MagnetoThingy and dward mats UXV -> UMV
* update buildscript
* yeet magic number that could be
* spotlessApply
* Make the nanite tier 3, colen request
* Up nanite tier
* Comment
* Change name
* Change name
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: adam riondy <adampoplol@gmail.com>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
3 files changed, 745 insertions, 847 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index ed6c62f85a..bd84529cf5 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2,6 +2,8 @@ package gregtech.loaders.postload; import static gregtech.api.GregTech_API.mGTPlusPlus; import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.util.GT_ModHandler.getModItem; +import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import codechicken.nei.api.API; import cpw.mods.fml.common.Loader; @@ -214,35 +216,35 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addPrinterRecipe( GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L), - FluidRegistry.getFluidStack("squidink", 36), + getFluidStack("squidink", 36), GT_Values.NI, ItemList.Paper_Punch_Card_Empty.get(1L), 100, 2); GT_Values.RA.addPrinterRecipe( ItemList.Paper_Punch_Card_Empty.get(1L), - FluidRegistry.getFluidStack("squidink", 36), + getFluidStack("squidink", 36), ItemList.Tool_DataStick.getWithName(0L, "With Punch Card Data"), ItemList.Paper_Punch_Card_Encoded.get(1L), 100, 2); GT_Values.RA.addPrinterRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3L), - FluidRegistry.getFluidStack("squidink", 144), + getFluidStack("squidink", 144), ItemList.Tool_DataStick.getWithName(0L, "With Scanned Book Data"), ItemList.Paper_Printed_Pages.get(1L), 400, 2); GT_Values.RA.addPrinterRecipe( new ItemStack(Items.map, 1, 32767), - FluidRegistry.getFluidStack("squidink", 144), + getFluidStack("squidink", 144), ItemList.Tool_DataStick.getWithName(0L, "With Scanned Map Data"), new ItemStack(Items.filled_map, 1, 0), 400, 2); GT_Values.RA.addPrinterRecipe( new ItemStack(Items.book, 1, 32767), - FluidRegistry.getFluidStack("squidink", 144), + getFluidStack("squidink", 144), GT_Values.NI, GT_Utility.getWrittenBook("Manual_Printer", ItemList.Book_Written_01.get(1L)), 400, @@ -694,8 +696,8 @@ public class GT_MachineRecipeLoader implements Runnable { new ItemStack(Items.fermented_spider_eye, 1, 0), ItemList.IC2_Scrap.get(1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1L), - FluidRegistry.getFluidStack("potion.purpledrink", 750), - FluidRegistry.getFluidStack("sludge", 1000), + getFluidStack("potion.purpledrink", 750), + getFluidStack("sludge", 1000), ItemList.Food_Chum.get(4L), 128, 24); @@ -770,7 +772,7 @@ public class GT_MachineRecipeLoader implements Runnable { 900, 8); GT_Values.RA.addMixerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 1), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1L), GT_Values.NI, @@ -780,7 +782,7 @@ public class GT_MachineRecipeLoader implements Runnable { 20, 16); GT_Values.RA.addMixerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 1), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1L), GT_Values.NI, @@ -796,7 +798,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(1000L), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), 64, 16); GT_Values.RA.addMixerRecipe( @@ -806,7 +808,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(1000L), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), 64, 16); GT_Values.RA.addMixerRecipe( @@ -816,7 +818,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(1000L), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), 64, 16); GT_Values.RA.addMixerRecipe( @@ -826,7 +828,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(1000L), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), + getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 8L, 0), 64, 16); GT_Values.RA.addMixerRecipe( @@ -836,7 +838,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, Materials.Water.getFluid(250L), GT_Values.NF, - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 2L, 1), + getModItem(GT_MachineRecipeLoader.aTextForestry, "soil", 2L, 1), 16, 16); GT_Values.RA.addMixerRecipe( @@ -905,7 +907,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(125), - FluidRegistry.getFluidStack("ic2coolant", 125), + getFluidStack("ic2coolant", 125), GT_Values.NI, 256, 48); @@ -915,7 +917,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NI, GT_Values.NI, GT_ModHandler.getDistilledWater(1000), - FluidRegistry.getFluidStack("ic2coolant", 1000), + getFluidStack("ic2coolant", 1000), GT_Values.NI, 256, 48); @@ -1125,7 +1127,7 @@ public class GT_MachineRecipeLoader implements Runnable { 200, 64); - FluidStack tFD = FluidRegistry.getFluidStack("fluiddeath", 30); + FluidStack tFD = getFluidStack("fluiddeath", 30); if (tFD != null && tFD.getFluid() != null && tFD.amount > 0) { GT_Values.RA.addMixerRecipe( ItemList.SFMixture.get(30), @@ -1203,7 +1205,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), ItemList.MSFMixture.get(6), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1215,7 +1217,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), ItemList.MSFMixture.get(4), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1227,7 +1229,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), ItemList.MSFMixture.get(2), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1239,7 +1241,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), ItemList.MSFMixture.get(6), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1251,7 +1253,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), ItemList.MSFMixture.get(4), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1263,7 +1265,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), ItemList.MSFMixture.get(2), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4), + getModItem("Thaumcraft", "ItemResource", 4), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), @@ -1493,7 +1495,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Ball.get(0L), Materials.Mercury.getFluid(1000L), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 3), + getModItem("Thaumcraft", "ItemResource", 1, 3), 128, 4); GT_Values.RA.addFluidSolidifierRecipe( @@ -2237,7 +2239,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 2L, 14), + getModItem("Thaumcraft", "ItemResource", 2L, 14), GT_Values.NI, GT_Values.NI, GT_Values.NI, @@ -2249,7 +2251,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), Dyes.dyeRed.getFluidDye(j, 72L), - GT_ModHandler.getModItem("BuildCraft|Transport", "pipeWire", 4L, 0), + getModItem("BuildCraft|Transport", "pipeWire", 4L, 0), GT_Values.NI, GT_Values.NI, null, @@ -2260,7 +2262,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), Dyes.dyeBlue.getFluidDye(j, 72L), - GT_ModHandler.getModItem("BuildCraft|Transport", "pipeWire", 4L, 1), + getModItem("BuildCraft|Transport", "pipeWire", 4L, 1), GT_Values.NI, GT_Values.NI, null, @@ -2271,7 +2273,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), Dyes.dyeGreen.getFluidDye(j, 72L), - GT_ModHandler.getModItem("BuildCraft|Transport", "pipeWire", 4L, 2), + getModItem("BuildCraft|Transport", "pipeWire", 4L, 2), GT_Values.NI, GT_Values.NI, null, @@ -2282,7 +2284,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), Dyes.dyeYellow.getFluidDye(j, 72L), - GT_ModHandler.getModItem("BuildCraft|Transport", "pipeWire", 4L, 3), + getModItem("BuildCraft|Transport", "pipeWire", 4L, 3), GT_Values.NI, GT_Values.NI, null, @@ -2330,21 +2332,11 @@ public class GT_MachineRecipeLoader implements Runnable { } } GT_Values.RA.addFluidExtractionRecipe( - ItemList.Dye_SquidInk.get(1L), - GT_Values.NI, - FluidRegistry.getFluidStack("squidink", 144), - 10000, - 128, - 4); + ItemList.Dye_SquidInk.get(1L), GT_Values.NI, getFluidStack("squidink", 144), 10000, 128, 4); GT_Values.RA.addFluidExtractionRecipe( - ItemList.Dye_Indigo.get(1L), GT_Values.NI, FluidRegistry.getFluidStack("indigo", 144), 10000, 128, 4); + ItemList.Dye_Indigo.get(1L), GT_Values.NI, getFluidStack("indigo", 144), 10000, 128, 4); GT_Values.RA.addFluidExtractionRecipe( - ItemList.Crop_Drop_Indigo.get(1L), - GT_Values.NI, - FluidRegistry.getFluidStack("indigo", 144), - 10000, - 128, - 4); + ItemList.Crop_Drop_Indigo.get(1L), GT_Values.NI, getFluidStack("indigo", 144), 10000, 128, 4); GT_Values.RA.addFluidExtractionRecipe( ItemList.Crop_Drop_MilkWart.get(1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L), @@ -2389,7 +2381,7 @@ public class GT_MachineRecipeLoader implements Runnable { 32, 4); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 3), + getModItem("Thaumcraft", "ItemResource", 1, 3), GT_Values.NI, Materials.Mercury.getFluid(1000L), 10000, @@ -2411,21 +2403,21 @@ public class GT_MachineRecipeLoader implements Runnable { 64); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem("IC2", "blockAlloyGlass", 1L, 0), + getModItem("IC2", "blockAlloyGlass", 1L, 0), GT_Values.NI, Materials.ReinforceGlass.getMolten(144), 10000, 100, 1920); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_DC, "item.ReinforcedGlassPlate", 1L, 0), + getModItem(MOD_ID_DC, "item.ReinforcedGlassPlate", 1L, 0), GT_Values.NI, Materials.ReinforceGlass.getMolten(72), 10000, 50, 1920); GT_Values.RA.addFluidExtractionRecipe( - GT_ModHandler.getModItem(MOD_ID_DC, "item.ReinforcedGlassLense", 1L, 0), + getModItem(MOD_ID_DC, "item.ReinforcedGlassLense", 1L, 0), GT_Values.NI, Materials.ReinforceGlass.getMolten(54), 10000, @@ -2444,7 +2436,7 @@ public class GT_MachineRecipeLoader implements Runnable { 128, 4); GT_Values.RA.addFluidSmelterRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextForestry, "phosphor", 1L), + getModItem(GT_MachineRecipeLoader.aTextForestry, "phosphor", 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), Materials.Lava.getFluid(800L), 1000, @@ -2466,65 +2458,65 @@ public class GT_MachineRecipeLoader implements Runnable { 1200, 256); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), Materials.Water.getFluid(200L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), 8000, 2000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), Materials.Water.getFluid(200L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), 8000, 2000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), Materials.Water.getFluid(200L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), 8000, 2000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), GT_ModHandler.getDistilledWater(100L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), 9000, 1000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), GT_ModHandler.getDistilledWater(100L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), 9000, 1000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), GT_ModHandler.getDistilledWater(100L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), 9000, 1000, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 0), Materials.Void.getMolten(36L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), 10000, 500, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 600), Materials.Void.getMolten(36L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 11), 10000, 500, 24); GT_Values.RA.addAutoclaveRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), + getModItem(GT_MachineRecipeLoader.aTextAE, "item.ItemCrystalSeed", 1L, 1200), Materials.Void.getMolten(36L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 12), 10000, 500, 24); @@ -2648,7 +2640,7 @@ public class GT_MachineRecipeLoader implements Runnable { 800, 7920); - if (!Loader.isModLoaded("miscutils")) { + if (!Loader.isModLoaded(MOD_ID_GTPP)) { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), @@ -3587,21 +3579,21 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Plate.get(0L), Materials.ReinforceGlass.getMolten(72), - GT_ModHandler.getModItem(MOD_ID_DC, "item.ReinforcedGlassPlate", 1L, 0), + getModItem(MOD_ID_DC, "item.ReinforcedGlassPlate", 1L, 0), 160, 1920); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Block.get(0L), Materials.ReinforceGlass.getMolten(144), - GT_ModHandler.getModItem("IC2", "blockAlloyGlass", 1L), + getModItem("IC2", "blockAlloyGlass", 1L), 160, 1920); GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.UnknowCrystal", 4L), + getModItem("GalaxySpace", "item.UnknowCrystal", 4L), Materials.Osmiridium.getDust(2), Materials.GrowthMediumSterilized.getFluid(1000L), - FluidRegistry.getFluidStack("bacterialsludge", 1000), + getFluidStack("bacterialsludge", 1000), ItemList.Circuit_Chip_Stemcell.get(64L), GT_Values.NI, 600, @@ -3610,7 +3602,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Circuit_Chip_Stemcell.get(32L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CosmicNeutronium, 4), Materials.BioMediumSterilized.getFluid(2000L), - FluidRegistry.getFluidStack("mutagen", 2000), + getFluidStack("mutagen", 2000), ItemList.Circuit_Chip_Biocell.get(32L), GT_Values.NI, 1200, @@ -3630,74 +3622,74 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), 100, 120); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), 100, 120); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 2), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 2), 200, 120); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 3), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 3), 100, 480); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 2L, 4), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 2L, 4), 200, 120); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 5), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 5), 300, 120); GT_Values.RA.addFormingPressRecipe( new ItemStack(Items.comparator, 1, 32767), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 6), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 6), 300, 120); GT_Values.RA.addFormingPressRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 13), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 10), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 13), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), 200, 16); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 13), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 13), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), 200, 16); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 14), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 17), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 14), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 17), 200, 16); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 15), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 18), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 15), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 18), 200, 16); GT_Values.RA.addFormingPressRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SiliconSG, 1L), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 19), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 0L, 19), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), 200, 16); @@ -3730,7 +3722,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), - GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 0), + getModItem("Forestry", "chipsets", 1L, 0), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -3743,7 +3735,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), - GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 1), + getModItem("Forestry", "chipsets", 1L, 1), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -3756,7 +3748,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), - GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 2), + getModItem("Forestry", "chipsets", 1L, 2), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe( @@ -3769,7 +3761,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), - GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 3), + getModItem("Forestry", "chipsets", 1L, 3), 200, 30); // Circuit soldering @@ -4060,7 +4052,7 @@ public class GT_MachineRecipeLoader implements Runnable { 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(MOD_ID_DC, "item.ArtificialLeather", 1L, 0), + getModItem(MOD_ID_DC, "item.ArtificialLeather", 1L, 0), new ItemStack(Items.lead, 1, 32767), Materials.Glue.getFluid(72L), new ItemStack(Items.name_tag, 1, 0), @@ -4081,119 +4073,119 @@ public class GT_MachineRecipeLoader implements Runnable { 100, 4); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfLife1", 4L, 0), + getModItem("TwilightForest", "item.charmOfLife1", 4L, 0), GT_Utility.getIntegratedCircuit(4), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfLife2", 1L, 0), + getModItem("TwilightForest", "item.charmOfLife2", 1L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping1", 4L, 0), + getModItem("TwilightForest", "item.charmOfKeeping1", 4L, 0), GT_Utility.getIntegratedCircuit(4), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping2", 1L, 0), + getModItem("TwilightForest", "item.charmOfKeeping2", 1L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping2", 4L, 0), + getModItem("TwilightForest", "item.charmOfKeeping2", 4L, 0), GT_Utility.getIntegratedCircuit(4), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping3", 1L, 0), + getModItem("TwilightForest", "item.charmOfKeeping3", 1L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfLife2", 1L, 0), + getModItem("TwilightForest", "item.charmOfLife2", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfLife1", 4L, 0), + getModItem("TwilightForest", "item.charmOfLife1", 4L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping2", 1L, 0), + getModItem("TwilightForest", "item.charmOfKeeping2", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping1", 4L, 0), + getModItem("TwilightForest", "item.charmOfKeeping1", 4L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping3", 1L, 0), + getModItem("TwilightForest", "item.charmOfKeeping3", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_Values.NF, - GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping2", 4L, 0), + getModItem("TwilightForest", "item.charmOfKeeping2", 4L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), - GT_ModHandler.getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 16), + getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), Materials.Redstone.getMolten(144L), |
