diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-01-30 10:56:42 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-30 10:56:42 -0800 |
| commit | 0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a (patch) | |
| tree | 1e2c649f3a6ce3f6b2babd0098a5f4819e9cd0b6 /src/main/java/gregtech/loaders | |
| parent | f8cc82edeb9810c45cba762d733a2c909a302faa (diff) | |
| download | GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.gz GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.bz2 GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.zip | |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gregtech/loaders')
140 files changed, 18987 insertions, 27010 deletions
diff --git a/src/main/java/gregtech/loaders/ExtraIcons.java b/src/main/java/gregtech/loaders/ExtraIcons.java index ff867cce25..42d5c1ec7c 100644 --- a/src/main/java/gregtech/loaders/ExtraIcons.java +++ b/src/main/java/gregtech/loaders/ExtraIcons.java @@ -2,12 +2,14 @@ package gregtech.loaders; import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + public class ExtraIcons { + public static IIcon steelLargeCellInner; public static IIcon aluminiumLargeCellInner; public static IIcon stainlesssteelLargeCellInner; @@ -24,10 +26,10 @@ public class ExtraIcons { if (reg.getTextureType() == 1) { // are for items steelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/steel_inner"); aluminiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/aluminium_inner"); - stainlesssteelLargeCellInner = - reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); - tungstensteelLargeCellInner = - reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); + stainlesssteelLargeCellInner = reg + .registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); + tungstensteelLargeCellInner = reg + .registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); titaniumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/titanium_inner"); chromiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/chromium_inner"); iridiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/iridium_inner"); diff --git a/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java b/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java index 01987f8b47..37f626ef90 100644 --- a/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java @@ -3,6 +3,7 @@ package gregtech.loaders.load; import gregtech.api.util.GT_Log; public class GT_CoverBehaviorLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Adding Cover Behaviors"); diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 580223f444..470924053f 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -1,5 +1,9 @@ package gregtech.loaders.load; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -9,24 +13,22 @@ 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 net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class GT_FuelLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Initializing various Fuels."); - ItemList.sBlueVitriol = - GT_Mod.gregtechproxy.addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295); - ItemList.sNickelSulfate = - GT_Mod.gregtechproxy.addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295); - ItemList.sGreenVitriol = - GT_Mod.gregtechproxy.addFluid("solution.greenvitriol", "Green Vitriol water solution", null, 1, 295); - ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid( - "indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3 - ItemList.sLeadZincSolution = - GT_Mod.gregtechproxy.addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295); + ItemList.sBlueVitriol = GT_Mod.gregtechproxy + .addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295); + ItemList.sNickelSulfate = GT_Mod.gregtechproxy + .addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295); + ItemList.sGreenVitriol = GT_Mod.gregtechproxy + .addFluid("solution.greenvitriol", "Green Vitriol water solution", null, 1, 295); + ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy + .addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3 + ItemList.sLeadZincSolution = GT_Mod.gregtechproxy + .addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295); ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295); new GT_Recipe( new ItemStack(Items.lava_bucket), @@ -39,8 +41,8 @@ public class GT_FuelLoader implements Runnable { GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L) }, null, null, null, @@ -49,8 +51,8 @@ public class GT_FuelLoader implements Runnable { 50000); GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L) }, null, null, null, @@ -59,8 +61,8 @@ public class GT_FuelLoader implements Runnable { 250000); GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L) }, null, null, null, @@ -69,8 +71,8 @@ public class GT_FuelLoader implements Runnable { 500000); GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L) }, null, null, null, @@ -79,8 +81,8 @@ public class GT_FuelLoader implements Runnable { 250000); GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L) }, null, null, null, @@ -89,8 +91,8 @@ public class GT_FuelLoader implements Runnable { 1000000); GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L) }, null, null, null, @@ -101,8 +103,8 @@ public class GT_FuelLoader implements Runnable { // BloodMagic GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L)}, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "blankSlate", 1L)}, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "blankSlate", 1L) }, null, null, null, @@ -111,8 +113,8 @@ public class GT_FuelLoader implements Runnable { 400); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L)}, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L)}, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L) }, null, null, null, @@ -121,8 +123,8 @@ public class GT_FuelLoader implements Runnable { 1000); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L)}, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L)}, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L) }, null, null, null, @@ -131,8 +133,8 @@ public class GT_FuelLoader implements Runnable { 8000); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 1L, 27)}, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L)}, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 1L, 27) }, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L) }, null, null, null, diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index 3e1cf72c06..e894acf4be 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -1,5 +1,15 @@ package gregtech.loaders.load; +import mods.railcraft.api.core.items.IToolCrowbar; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.IFluidContainerItem; + import buildcraft.api.tools.IToolWrench; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; @@ -14,64 +24,62 @@ import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import mods.railcraft.api.core.items.IToolCrowbar; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.IFluidContainerItem; public class GT_ItemIterator implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Scanning for certain kinds of compatible Machineblocks."); ItemStack tStack2; ItemStack tStack; - if (null - != (tStack = GT_ModHandler.getRecipeOutput( - tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), - tStack2, - tStack2, - tStack2, - null, - tStack2, - tStack2, - tStack2, - tStack2))) { + if (null != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + tStack2, + tStack2, + tStack2, + null, + tStack2, + tStack2, + tStack2, + tStack2))) { GT_ModHandler.addPulverisationRecipe( - tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), null, 0, false); + tStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), + null, + 0, + false); GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L)); } - if (null - != (tStack = GT_ModHandler.getRecipeOutput( - tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L), - tStack2, - tStack2, - tStack2, - null, - tStack2, - tStack2, - tStack2, - tStack2))) { + if (null != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L), + tStack2, + tStack2, + tStack2, + null, + tStack2, + tStack2, + tStack2, + tStack2))) { GT_OreDictUnificator.registerOre(OreDictNames.craftingRawMachineTier00, tStack); GT_ModHandler.addPulverisationRecipe( - tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), null, 0, false); + tStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), + null, + 0, + false); GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L)); } ItemStack tStack3; - if (null - != (tStack = GT_ModHandler.getRecipeOutput( - tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), - tStack3 = new ItemStack(Blocks.glass, 1, 0), - tStack2, - tStack3, - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), - tStack3, - tStack2, - tStack3, - tStack2))) { + if (null != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), + tStack3 = new ItemStack(Blocks.glass, 1, 0), + tStack2, + tStack3, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), + tStack3, + tStack2, + tStack3, + tStack2))) { GT_ModHandler.addPulverisationRecipe( tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L), @@ -79,17 +87,16 @@ public class GT_ItemIterator implements Runnable { 0, false); } - if (null - != (tStack = GT_ModHandler.getRecipeOutput( - tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), - tStack3 = new ItemStack(Blocks.glass, 1, 0), - tStack2, - tStack3, - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), - tStack3, - tStack2, - tStack3, - tStack2))) { + if (null != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), + tStack3 = new ItemStack(Blocks.glass, 1, 0), + tStack2, + tStack3, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), + tStack3, + tStack2, + tStack3, + tStack2))) { GT_ModHandler.addPulverisationRecipe( tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L), @@ -98,10 +105,19 @@ public class GT_ItemIterator implements Runnable { false); } GT_Log.out.println("GT_Mod: Registering various Tools to be usable on GregTech Machines"); - GregTech_API.registerScrewdriver(GT_ModHandler.getRecipeOutput( - null, new ItemStack(Items.iron_ingot, 1), null, new ItemStack(Items.stick, 1))); - GregTech_API.registerScrewdriver(GT_ModHandler.getRecipeOutput( - new ItemStack(Items.iron_ingot, 1), null, null, null, new ItemStack(Items.stick, 1))); + GregTech_API.registerScrewdriver( + GT_ModHandler.getRecipeOutput( + null, + new ItemStack(Items.iron_ingot, 1), + null, + new ItemStack(Items.stick, 1))); + GregTech_API.registerScrewdriver( + GT_ModHandler.getRecipeOutput( + new ItemStack(Items.iron_ingot, 1), + null, + null, + null, + new ItemStack(Items.stick, 1))); GT_Log.out.println( "GT_Mod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)"); @@ -144,7 +160,7 @@ public class GT_ItemIterator implements Runnable { GT_Log.out.println("GT_Mod: Scanning ItemList."); try { - /*(tName.equals("tile.sedimentaryStone")) ||**/ + /* (tName.equals("tile.sedimentaryStone")) || **/ for (Object o : Item.itemRegistry) { Object tObject; if (((tObject = o) instanceof Item) && (!(tObject instanceof GT_Generic_Item))) { @@ -155,9 +171,9 @@ public class GT_ItemIterator implements Runnable { if ((!tItem.isDamageable()) && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { if ((GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, - "infiniteDurabilityRCCrowbars", - false)) + ConfigCategories.Recipes.disabledrecipes, + "infiniteDurabilityRCCrowbars", + false)) && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) { GT_Log.out.println("GT_Mod: Removed infinite RC Crowbar: " + tName); } @@ -169,9 +185,9 @@ public class GT_ItemIterator implements Runnable { if ((!tItem.isDamageable()) && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { if ((GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, - "infiniteDurabilityBCWrenches", - false)) + ConfigCategories.Recipes.disabledrecipes, + "infiniteDurabilityBCWrenches", + false)) && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) { GT_Log.out.println("GT_Mod: Removed infinite BC Wrench: " + tName); } @@ -194,8 +210,7 @@ public class GT_ItemIterator implements Runnable { } } } - if (((tItem instanceof ItemFood)) - && (tItem != ItemList.IC2_Food_Can_Filled.getItem()) + if (((tItem instanceof ItemFood)) && (tItem != ItemList.IC2_Food_Can_Filled.getItem()) && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) { int tFoodValue = ((ItemFood) tItem).func_150905_g(new ItemStack(tItem, 1, 0)); if (tFoodValue > 0) { @@ -283,124 +298,122 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lignite, new ItemStack(tItem, 1, 0)); } if ((tName.equals("tile.extrabiomes.redrock")) || (tName.equals("tile.bop.redRocks"))) { - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2)); } if (tName.equals("tile.rpstone")) { - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 6)); } if ( - /**(tName.equals("tile.sedimentaryStone")) ||**/ - ((tName.equals("tile.igneousStone")) - || (tName.equals("tile.igneousStoneBrick")) + /** (tName.equals("tile.sedimentaryStone")) || **/ + ((tName.equals("tile.igneousStone")) || (tName.equals("tile.igneousStoneBrick")) || (tName.equals("tile.igneousCobblestone")))) { - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 6)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 7)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 7)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 8)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 9)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 10)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 11)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 12)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 13)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 14)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 15)); - } - if ((tName.equals("tile.metamorphicStone")) - || (tName.equals("tile.metamorphicStoneBrick")) + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 8)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 9)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 10)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 11)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 12)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 13)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 14)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 15)); + } + if ((tName.equals("tile.metamorphicStone")) || (tName.equals("tile.metamorphicStoneBrick")) || (tName.equals("tile.metamorphicCobblestone"))) { - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 6)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 7)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 7)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 8)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 9)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 10)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 11)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 12)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 13)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 14)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 15)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 8)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 9)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 10)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 11)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 12)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 13)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 14)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 15)); } if (tName.equals("tile.blockCosmeticSolid")) { - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator + .registerOre(OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4)); } if (tName.equals("tile.enderchest")) { GT_OreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(tItem, 1, 32767)); } if (tName.equals("tile.autoWorkbenchBlock")) { - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0)); } if (tName.equals("tile.pumpBlock")) { GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0)); - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, "BCPump", false)) { + if (GregTech_API.sRecipeFile + .get(ConfigCategories.Recipes.disabledrecipes, "BCPump", false)) { GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 0)); } } @@ -408,8 +421,8 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingTank, new ItemStack(tItem, 1, 0)); } if (tName.equals("item.drawplateDiamond")) { - GT_OreDictUnificator.registerOre( - ToolDictNames.craftingToolDrawplate, new ItemStack(tItem, 1, 32767)); + GT_OreDictUnificator + .registerOre(ToolDictNames.craftingToolDrawplate, new ItemStack(tItem, 1, 32767)); } } } diff --git a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java index d067cf74d5..ce66b80a55 100644 --- a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java @@ -1,13 +1,15 @@ package gregtech.loaders.load; -import gregtech.GT_Mod; -import gregtech.api.enums.SoundResource; -import gregtech.api.util.GT_Log; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import gregtech.GT_Mod; +import gregtech.api.enums.SoundResource; +import gregtech.api.util.GT_Log; + public class GT_SonictronLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Loading Sonictron Sounds"); @@ -110,8 +112,8 @@ public class GT_SonictronLoader implements Runnable { GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.glass_bottle, 1)); GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BURP.toString()); GT_Mod.gregtechproxy.mSoundCounts.add(1); - GT_Mod.gregtechproxy.mSoundItems.add( - new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1)); + GT_Mod.gregtechproxy.mSoundItems + .add(new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1)); GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CHESTOPEN.toString()); GT_Mod.gregtechproxy.mSoundCounts.add(1); GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.chest, 1)); diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index d8fc898cf4..fe8ff8c12d 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -7,6 +7,7 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.TextureSet; public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandler { + public ProcessingConfig() { new GTNH_ExtraMaterials(); Materials.add(this); @@ -17,9 +18,8 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle /** This is just left here as an example of how to add new materials. **/ if (false) { int i = 0; - for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); - i < j; - i++) { + for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); i + < j; i++) { String aID = (i < 10 ? "0" : "") + i; new Materials( -1, @@ -54,25 +54,26 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle @Override public void onComponentInit() { /** This is just left here as an example of how to add components. **/ - /* Enabling specific components: - OrePrefixes.spring.enableComponent(Materials.Cobalt); - OrePrefixes.ingotDouble.enableComponent(Materials.Cobalt); - OrePrefixes.ingotTriple.enableComponent(Materials.Cobalt); - OrePrefixes.ingotQuadruple.enableComponent(Materials.Cobalt); - OrePrefixes.ingotQuintuple.enableComponent(Materials.Cobalt); - OrePrefixes.plateDouble.enableComponent(Materials.Cobalt); - OrePrefixes.plateTriple.enableComponent(Materials.Cobalt); - OrePrefixes.plateQuadruple.enableComponent(Materials.Cobalt); - OrePrefixes.plateQuintuple.enableComponent(Materials.Cobalt); - OrePrefixes.plateDense.enableComponent(Materials.Cobalt); */ + /* + * Enabling specific components: OrePrefixes.spring.enableComponent(Materials.Cobalt); + * OrePrefixes.ingotDouble.enableComponent(Materials.Cobalt); + * OrePrefixes.ingotTriple.enableComponent(Materials.Cobalt); + * OrePrefixes.ingotQuadruple.enableComponent(Materials.Cobalt); + * OrePrefixes.ingotQuintuple.enableComponent(Materials.Cobalt); + * OrePrefixes.plateDouble.enableComponent(Materials.Cobalt); + * OrePrefixes.plateTriple.enableComponent(Materials.Cobalt); + * OrePrefixes.plateQuadruple.enableComponent(Materials.Cobalt); + * OrePrefixes.plateQuintuple.enableComponent(Materials.Cobalt); + * OrePrefixes.plateDense.enableComponent(Materials.Cobalt); + */ } @Override public void onComponentIteration(Materials aMaterial) { /** This is just left here as an example of how to add components. **/ - /*Enabling/Disabling components depending on the current Materials values: - if ((aMaterial.mTypes & 0x40) != 0) { //This material can be made into tool heads - OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); - } */ + /* + * Enabling/Disabling components depending on the current Materials values: if ((aMaterial.mTypes & 0x40) != 0) + * { //This material can be made into tool heads OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); } + */ } } diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index d1c7d48f3a..58808e2162 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -8,6 +8,7 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHandler { + public static boolean aTGregSupport = Loader.isModLoaded("TGregworks") || Loader.isModLoaded(MOD_ID_DC); public static boolean aEnableUBCMats = Loader.isModLoaded("UndergroundBiomes") || aTGregSupport; public static boolean aEnableThaumcraftMats = Loader.isModLoaded("Thaumcraft") || aTGregSupport; diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 4d5de34782..58f56cbd70 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -1,5 +1,19 @@ package gregtech.loaders.misc; +import java.util.concurrent.ConcurrentHashMap; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraft.stats.AchievementList; +import net.minecraft.stats.StatBase; +import net.minecraftforge.common.AchievementPage; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.fluids.FluidStack; + +import thaumcraft.api.ThaumcraftApiHelper; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -15,20 +29,9 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.common.items.GT_MetaGenerated_Tool_01; import ic2.core.Ic2Items; -import java.util.concurrent.ConcurrentHashMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; -import net.minecraft.stats.AchievementList; -import net.minecraft.stats.StatBase; -import net.minecraftforge.common.AchievementPage; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import net.minecraftforge.fluids.FluidStack; -import thaumcraft.api.ThaumcraftApiHelper; public class GT_Achievements { + public static int oreReg = -1; public static int assReg = -1; public ConcurrentHashMap<String, Achievement> achievementList; @@ -64,8 +67,8 @@ public class GT_Achievements { "tools", 0, 4, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), "flintpick", false); registerAchievement( @@ -73,7 +76,11 @@ public class GT_Achievements { 2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + Materials.BlueSteel, + Materials.StainlessSteel, + null), "tools", false); registerAchievement( @@ -81,7 +88,11 @@ public class GT_Achievements { 2, 6, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + Materials.BlueSteel, + Materials.StainlessSteel, + null), "driltime", false); registerAchievement( @@ -89,7 +100,11 @@ public class GT_Achievements { 3, 5, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + Materials.TungstenSteel, + Materials.TungstenSteel, + null), "driltime", false); registerAchievement( @@ -97,7 +112,11 @@ public class GT_Achievements { 3, 7, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.JACKHAMMER, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), + GT_MetaGenerated_Tool_01.JACKHAMMER, + 1, + Materials.TungstenSteel, + Materials.TungstenSteel, + null), "highpowerdrill", false); registerAchievement("repair", 4, 5, ItemList.Machine_HV_Disassembler.get(1), "highpowerdrill", false); @@ -107,13 +126,22 @@ public class GT_Achievements { -2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, Materials.Steel, Materials.Iron, null), + GT_MetaGenerated_Tool_01.UNIVERSALSPADE, + 1, + Materials.Steel, + Materials.Iron, + null), "tools", false); registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1), "unitool", false); registerAchievement( - "crushed", 0, 6, GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), "tools", false); + "crushed", + 0, + 6, + GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), + "tools", + false); registerAchievement( "cleandust", 0, @@ -147,7 +175,12 @@ public class GT_Achievements { registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1), "newfuel", false); } registerAchievement( - "bronze", 2, 0, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L), "flintpick", false); + "bronze", + 2, + 0, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L), + "flintpick", + false); registerAchievement( "simplyeco", 2, @@ -170,9 +203,19 @@ public class GT_Achievements { registerAchievement("gtcleanroom", -11, -10, ItemList.Machine_Multi_Cleanroom.get(1), "gtlogiccircuit", false); registerAchievement("energyflow", -13, -10, ItemList.Circuit_Nanoprocessor.get(1), "gtcleanroom", false); registerAchievement( - "gtquantumprocessor", -13, -12, ItemList.Circuit_Quantumprocessor.get(1), "energyflow", false); + "gtquantumprocessor", + -13, + -12, + ItemList.Circuit_Quantumprocessor.get(1), + "energyflow", + false); registerAchievement( - "gtcrystalprocessor", -11, -12, ItemList.Circuit_Crystalprocessor.get(1), "gtquantumprocessor", false); + "gtcrystalprocessor", + -11, + -12, + ItemList.Circuit_Crystalprocessor.get(1), + "gtquantumprocessor", + false); registerAchievement("gtwetware", -9, -12, ItemList.Circuit_Neuroprocessor.get(1), "gtcrystalprocessor", false); registerAchievement("gtwetmain", -7, -12, ItemList.Circuit_Wetwaremainframe.get(1), "gtwetware", false); @@ -185,10 +228,20 @@ public class GT_Achievements { registerAchievement("luck", 2, -6, ItemList.ZPM.get(1), "", false); registerAchievement( - "steel", 4, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), "bronze", false); + "steel", + 4, + 0, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), + "bronze", + false); registerAchievement("highpressure", 4, 2, ItemList.Machine_Steel_Boiler.get(1), "steel", false); registerAchievement( - "extremepressure", 4, 4, ItemList.Machine_Multi_LargeBoiler_Steel.get(1), "highpressure", false); + "extremepressure", + 4, + 4, + ItemList.Machine_Multi_LargeBoiler_Steel.get(1), + "highpressure", + false); registerAchievement("cheapermac", 6, 1, ItemList.Machine_LV_Hammer.get(1), "steel", false); registerAchievement( "complexalloys", @@ -238,7 +291,12 @@ public class GT_Achievements { registerAchievement("upgrade", 10, 0, ItemList.Casing_Coil_Kanthal.get(1), "gtaluminium", false); registerAchievement( - "titan", 14, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), "upgrade", false); + "titan", + 14, + 0, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), + "upgrade", + false); registerAchievement("magic", 14, 3, ItemList.MagicEnergyConverter_LV.get(1), "titan", false); registerAchievement("highmage", 10, 3, ItemList.MagicEnergyAbsorber_HV.get(1), "magic", false); registerAchievement("artificaldia", 12, 2, ItemList.IC2_Industrial_Diamond.get(1), "titan", false); @@ -254,7 +312,12 @@ public class GT_Achievements { "upgrade2", false); registerAchievement( - "osmium", 16, -2, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), "upgrade2", false); + "osmium", + 16, + -2, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), + "upgrade2", + false); registerAchievement("hightech", 15, -3, ItemList.Field_Generator_LV.get(1), "osmium", false); registerAchievement("amplifier", 16, -5, ItemList.Machine_LV_Amplifab.get(1), "hightech", false); registerAchievement("scanning", 13, -3, ItemList.Machine_HV_Scanner.get(1), "hightech", false); @@ -271,7 +334,12 @@ public class GT_Achievements { false); registerAchievement("upgrade3", 15, 5, ItemList.Casing_Coil_TungstenSteel.get(1), "tungstensteel", false); registerAchievement( - "hssg", 13, 5, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1L), "upgrade3", false); + "hssg", + 13, + 5, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1L), + "upgrade3", + false); registerAchievement("upgrade4", 11, 5, ItemList.Casing_Coil_HSSG.get(1), "hssg", false); registerAchievement( "stargatematerial", @@ -314,18 +382,21 @@ public class GT_Achievements { } if (GT_Mod.gregtechproxy.mAchievements) { - AchievementPage.registerAchievementPage(new AchievementPage("GregTech 5", (Achievement[]) - this.achievementList.values().toArray(new Achievement[this.achievementList.size()]))); + AchievementPage.registerAchievementPage( + new AchievementPage( + "GregTech 5", + (Achievement[]) this.achievementList.values() + .toArray(new Achievement[this.achievementList.size()]))); MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance().bus().register(this); } } - public static void registerOre( - Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) {} + public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, + boolean end) {} - public Achievement registerAchievement( - String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) { + public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement, + boolean special) { if (!GT_Mod.gregtechproxy.mAchievements) { return null; } @@ -342,14 +413,18 @@ public class GT_Achievements { return achievement; } - public Achievement registerAchievement( - String textId, int x, int y, ItemStack icon, String requirement, boolean special) { + public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, String requirement, + boolean special) { if (!GT_Mod.gregtechproxy.mAchievements) { return null; - } - ; - Achievement achievement = - new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon, getAchievement(requirement)); + } ; + Achievement achievement = new Achievement( + textId, + textId, + this.adjX + x, + this.adjY + y, + icon, + getAchievement(requirement)); if (special) { achievement.setSpecial(); } @@ -372,8 +447,8 @@ public class GT_Achievements { return null; } if (recipe.getOutput(0) == null) { - GT_Mod.GT_FML_LOGGER.error( - "Invalid achievement registration attempt for recipe with null output", new Exception()); + GT_Mod.GT_FML_LOGGER + .error("Invalid achievement registration attempt for recipe with null output", new Exception()); return null; } if (this.achievementList.get(recipe.getOutput(0).getUnlocalizedName()) == null) { @@ -571,30 +646,38 @@ public class GT_Achievements { issueAchievement(player, "energyhatch"); } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.processingarray")) { issueAchievement(player, "factory"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")) { - issueAchievement(player, "magic"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")) { - issueAchievement(player, "highmage"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.amplifab.tier.")) { - issueAchievement(player, "amplifier"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.massfab.tier.")) { - issueAchievement(player, "universal"); - issueAchievement(player, "buildMassFab"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.naquadah.tier.")) { - issueAchievement(player, "alienpower"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.replicator.tier.")) { - issueAchievement(player, "replication"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.basicgenerator.plasmagenerator.tier.07")) { - issueAchievement(player, "fullefficiency"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.largeturbine")) { - issueAchievement(player, "muchsteam"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.largehpturbine")) { - issueAchievement(player, "efficientsteam"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.cleanroom")) { - issueAchievement(player, "gtcleanroom"); - } + } else + if (stack.getUnlocalizedName().equals("gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")) { + issueAchievement(player, "magic"); + } else if (stack.getUnlocalizedName() + .equals("gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")) { + issueAchievement(player, "highmage"); + } else + if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.amplifab.tier.")) { + issueAchievement(player, "amplifier"); + } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.massfab.tier.")) { + issueAchievement(player, "universal"); + issueAchievement(player, "buildMassFab"); + } else + if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.naquadah.tier.")) { + issueAchievement(player, "alienpower"); + } else if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.basicmachine.replicator.tier.")) { + issueAchievement(player, "replication"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.basicgenerator.plasmagenerator.tier.07")) { + issueAchievement(player, "fullefficiency"); + } else + if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.largeturbine")) { + issueAchievement(player, "muchsteam"); + } else if (stack.getUnlocalizedName() + .equals("gt.blockmachines.multimachine.largehpturbine")) { + issueAchievement(player, "efficientsteam"); + } else + if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.cleanroom")) { + issueAchievement(player, "gtcleanroom"); + } } else if (stack.getUnlocalizedName().equals("gt.neutronreflector")) { issueAchievement(player, "reflect"); } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.1")) { @@ -663,17 +746,16 @@ public class GT_Achievements { } else if (data.mMaterial.mMaterial == Materials.Steel) { if (data.mPrefix == OrePrefixes.ingot && stack.stackSize == stack.getMaxStackSize()) { issueAchievement(player, "steel"); - } else if (data.mPrefix == OrePrefixes.nugget - && Loader.isModLoaded("Thaumcraft") + } else if (data.mPrefix == OrePrefixes.nugget && Loader.isModLoaded("Thaumcraft") && ThaumcraftApiHelper.isResearchComplete(player.getDisplayName(), "GT_IRON_TO_STEEL")) { - issueAchievement(player, "steel"); - } - // } else if (data.mPrefix == OrePrefixes.circuit && data.mMaterial.mMaterial == + issueAchievement(player, "steel"); + } + // } else if (data.mPrefix == OrePrefixes.circuit && data.mMaterial.mMaterial == // Materials.Advanced) { - // issueAchievement(player, "stepforward"); + // issueAchievement(player, "stepforward"); } } - // GT_FML_LOGGER.info(stack.getUnlocalizedName()); + // GT_FML_LOGGER.info(stack.getUnlocalizedName()); if (stack.getUnlocalizedName().startsWith("gt.metaitem.")) { switch (stack.getUnlocalizedName()) { case "gt.metaitem.02.32500": @@ -764,27 +846,32 @@ public class GT_Achievements { || (stack.getItem() == Ic2Items.quantumBoots.getItem()) || (stack.getItem() == Ic2Items.quantumHelmet.getItem()) || (stack.getItem() == Ic2Items.quantumLeggings.getItem())) { - issueAchievement(player, "buildQArmor"); - } else if (stack.getUnlocalizedName().equals("ic2.itemPartCircuitAdv")) { - issueAchievement(player, "stepforward"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.1")) { - issueAchievement(player, "upgrade"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.2")) { - issueAchievement(player, "upgrade2"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.3")) { - issueAchievement(player, "upgrade3"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.4")) { - issueAchievement(player, "upgrade4"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.5")) { - issueAchievement(player, "upgrade5"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.6")) { - issueAchievement(player, "over9000"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings.15")) { - issueAchievement(player, "conducting"); - } - if (player.capabilities.isCreativeMode - && stack.getUnlocalizedName() - .equals("gt.metaitem.01.32761")) { // Debug Scanner pickup shows all assline recipes. + issueAchievement(player, "buildQArmor"); + } else + if (stack.getUnlocalizedName().equals("ic2.itemPartCircuitAdv")) { + issueAchievement(player, "stepforward"); + } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.1")) { + issueAchievement(player, "upgrade"); + } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.2")) { + issueAchievement(player, "upgrade2"); + } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.3")) { + issueAchievement(player, "upgrade3"); + } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.4")) { + issueAchievement(player, "upgrade4"); + } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.5")) { + issueAchievement(player, "upgrade5"); + } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.6")) { + issueAchievement(player, "over9000"); + } else if (stack.getUnlocalizedName().equals("gt.blockcasings.15")) { + issueAchievement(player, "conducting"); + } + if (player.capabilities.isCreativeMode && stack.getUnlocalizedName().equals("gt.metaitem.01.32761")) { // Debug + // Scanner + // pickup + // shows + // all + // assline + // recipes. for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) { issueAchievement(player, recipe.getOutput(0).getUnlocalizedName()); recipe.mHidden = false; diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 55089c37d1..2ad9274c43 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -8,6 +8,18 @@ import static forestry.core.genetics.alleles.EnumAllele.*; import static gregtech.api.enums.GT_Values.MOD_ID_DC; import static gregtech.loaders.misc.GT_BeeDefinitionReference.*; +import java.awt.*; +import java.util.Arrays; +import java.util.Locale; +import java.util.function.Consumer; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import org.apache.commons.lang3.text.WordUtils; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.*; @@ -32,20 +44,12 @@ import gregtech.common.bees.GT_Bee_Mutation; import gregtech.common.items.CombType; import gregtech.common.items.DropType; import gregtech.common.items.PropolisType; -import java.awt.*; -import java.util.Arrays; -import java.util.Locale; -import java.util.function.Consumer; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import org.apache.commons.lang3.text.WordUtils; /** * Bride Class for Lambdas */ class GT_BeeDefinitionReference { + protected static final byte FORESTRY = 0; protected static final byte EXTRABEES = 1; protected static final byte GENDUSTRY = 2; @@ -56,229 +60,154 @@ class GT_BeeDefinitionReference { } public enum GT_BeeDefinition implements IBeeDefinition { + // organic - CLAY( - GT_BranchDefinition.ORGANIC, - "Clay", - true, - new Color(0xC8C8DA), - new Color(0x0000FF), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); - beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem("BiomesOPlenty", "mudball", 1, 0), 0.05f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { - AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOWER); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.VANILLA); - }, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Diligent"), 10); - tMutation.requireResource(Blocks.clay, 0); // blockStainedHardenedClay - }), - SLIMEBALL( - GT_BranchDefinition.ORGANIC, - "SlimeBall", - true, - new Color(0x4E9E55), - new Color(0x00FF15), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f); - beeSpecies.addProduct(new ItemStack(Items.slime_ball, 1), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.05f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - if (Loader.isModLoaded("TConstruct")) { - beeSpecies.addProduct(GT_ModHandler.getModItem("TConstruct", "strangeFood", 1, 0), 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem("TConstruct", "slime.gel", 1, 2), 0.02f); - } - }, - template -> { - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.MUSHROOMS); - AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOWER); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "water")); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Marshy"), CLAY, 7); - if (Loader.isModLoaded("TConstruct")) - tMutation.requireResource(GameRegistry.findBlock("TConstruct", "slime.gel"), 1); - }), - PEAT( - GT_BranchDefinition.ORGANIC, - "Peat", - true, - new Color(0x906237), - new Color(0x58300B), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f); - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "peat", 1, 0), 0.15f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "mulch", 1, 0), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTER); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT); - AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); - }, - dis -> dis.registerMutation(getSpecies(FORESTRY, "Rural"), CLAY, 10)), - STICKYRESIN( - GT_BranchDefinition.ORGANIC, - "StickyResin", - true, - new Color(0x2E8F5B), - new Color(0xDCC289), + CLAY(GT_BranchDefinition.ORGANIC, "Clay", true, new Color(0xC8C8DA), new Color(0x0000FF), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); + beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem("BiomesOPlenty", "mudball", 1, 0), 0.05f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> { + AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOWER); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.VANILLA); + }, dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Diligent"), 10); + tMutation.requireResource(Blocks.clay, 0); // blockStainedHardenedClay + }), + SLIMEBALL(GT_BranchDefinition.ORGANIC, "SlimeBall", true, new Color(0x4E9E55), new Color(0x00FF15), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f); + beeSpecies.addProduct(new ItemStack(Items.slime_ball, 1), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.05f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + if (Loader.isModLoaded("TConstruct")) { + beeSpecies.addProduct(GT_ModHandler.getModItem("TConstruct", "strangeFood", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem("TConstruct", "slime.gel", 1, 2), 0.02f); + } + }, template -> { + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.MUSHROOMS); + AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOWER); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "water")); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Marshy"), CLAY, 7); + if (Loader.isModLoaded("TConstruct")) + tMutation.requireResource(GameRegistry.findBlock("TConstruct", "slime.gel"), 1); + }), + PEAT(GT_BranchDefinition.ORGANIC, "Peat", true, new Color(0x906237), new Color(0x58300B), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "peat", 1, 0), 0.15f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "mulch", 1, 0), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTER); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT); + AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); + }, dis -> dis.registerMutation(getSpecies(FORESTRY, "Rural"), CLAY, 10)), + STICKYRESIN(GT_BranchDefinition.ORGANIC, "StickyResin", true, new Color(0x2E8F5B), new Color(0xDCC289), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.15f); beeSpecies.addSpecialty(ItemList.IC2_Resin.get(1), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOWER); AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SLIMEBALL, PEAT, 15); tMutation.requireResource("logRubber"); }), - COAL( - GT_BranchDefinition.ORGANIC, - "Coal", - true, - new Color(0x666666), - new Color(0x525252), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COAL), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.CACTI); - AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_2); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.DOWN_1); - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectCreeper); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Industrious"), PEAT, 9); - tMutation.requireResource("blockCoal"); - }), - OIL( - GT_BranchDefinition.ORGANIC, - "Oil", - true, - new Color(0x4C4C4C), - new Color(0x333333), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OIL), 0.75f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOWER); - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL); - AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "water")); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); - }, - dis -> dis.registerMutation(COAL, STICKYRESIN, 4)), - SANDWICH( - GT_BranchDefinition.ORGANIC, - "Sandwich", - true, - new Color(0x32CD32), - new Color(0xDAA520), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); - beeSpecies.addSpecialty(ItemList.Food_Sliced_Cucumber.get(1), 0.05f); - beeSpecies.addSpecialty(ItemList.Food_Sliced_Onion.get(1), 0.05f); - beeSpecies.addSpecialty(ItemList.Food_Sliced_Tomato.get(1), 0.05f); - beeSpecies.addSpecialty(ItemList.Food_Sliced_Cheese.get(1), 0.05f); - beeSpecies.addSpecialty(new ItemStack(Items.cooked_porkchop, 1, 0), 0.05f); - beeSpecies.addSpecialty(new ItemStack(Items.cooked_beef, 1, 0), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOW); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_2); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectFertile); - AlleleHelper.instance.set(template, TERRITORY, Territory.LARGE); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTER); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT); - AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); - }, - dis -> dis.registerMutation(getSpecies(FORESTRY, "Agrarian"), getSpecies(MAGICBEES, "TCBatty"), 10)), - ASH( - GT_BranchDefinition.ORGANIC, - "Ash", - true, - new Color(0x1e1a18), - new Color(0xc6c6c6), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ASH), 0.15f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.NORMAL); - AlleleHelper.instance.set(template, TERRITORY, Territory.LARGE); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTER); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT); - AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(COAL, CLAY, 10); - tMutation.restrictTemperature(HELLISH); - }), - APATITE( - GT_BranchDefinition.ORGANIC, - "Apatite", - true, - new Color(0xc1c1f6), - new Color(0x676784), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.APATITE), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(WARM); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FASTEST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT); - AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(ASH, COAL, 10); - tMutation.requireResource("blockApatite"); - }), - FERTILIZER( - GT_BranchDefinition.ORGANIC, - "Fertilizer", - true, - new Color(0x7fcef5), - new Color(0x654525), + COAL(GT_BranchDefinition.ORGANIC, "Coal", true, new Color(0x666666), new Color(0x525252), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COAL), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> { + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.CACTI); + AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_2); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.DOWN_1); + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectCreeper); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Industrious"), PEAT, 9); + tMutation.requireResource("blockCoal"); + }), + OIL(GT_BranchDefinition.ORGANIC, "Oil", true, new Color(0x4C4C4C), new Color(0x333333), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OIL), 0.75f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOWER); + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL); + AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "water")); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); + }, dis -> dis.registerMutation(COAL, STICKYRESIN, 4)), + SANDWICH(GT_BranchDefinition.ORGANIC, "Sandwich", true, new Color(0x32CD32), new Color(0xDAA520), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addSpecialty(ItemList.Food_Sliced_Cucumber.get(1), 0.05f); + beeSpecies.addSpecialty(ItemList.Food_Sliced_Onion.get(1), 0.05f); + beeSpecies.addSpecialty(ItemList.Food_Sliced_Tomato.get(1), 0.05f); + beeSpecies.addSpecialty(ItemList.Food_Sliced_Cheese.get(1), 0.05f); + beeSpecies.addSpecialty(new ItemStack(Items.cooked_porkchop, 1, 0), 0.05f); + beeSpecies.addSpecialty(new ItemStack(Items.cooked_beef, 1, 0), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOW); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_2); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectFertile); + AlleleHelper.instance.set(template, TERRITORY, Territory.LARGE); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTER); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT); + AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); + }, dis -> dis.registerMutation(getSpecies(FORESTRY, "Agrarian"), getSpecies(MAGICBEES, "TCBatty"), 10)), + ASH(GT_BranchDefinition.ORGANIC, "Ash", true, new Color(0x1e1a18), new Color(0xc6c6c6), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ASH), 0.15f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.NORMAL); + AlleleHelper.instance.set(template, TERRITORY, Territory.LARGE); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTER); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT); + AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(COAL, CLAY, 10); + tMutation.restrictTemperature(HELLISH); + }), + APATITE(GT_BranchDefinition.ORGANIC, "Apatite", true, new Color(0xc1c1f6), new Color(0x676784), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.APATITE), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(WARM); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FASTEST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT); + AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(ASH, COAL, 10); + tMutation.requireResource("blockApatite"); + }), + FERTILIZER(GT_BranchDefinition.ORGANIC, "Fertilizer", true, new Color(0x7fcef5), new Color(0x654525), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1), 0.2f); @@ -287,260 +216,152 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(ItemList.IC2_Fertilizer.get(1), 0.3f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(WARM); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.FASTEST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT); AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); - }, - dis -> dis.registerMutation(ASH, APATITE, 8)), + }, dis -> dis.registerMutation(ASH, APATITE, 8)), // Phosphorus bee, Humidity: normal, Temperature: Hot, Parents: Apatite & Ash, Mutationrate: 12%, Combrate: 55% - PHOSPHORUS( - GT_BranchDefinition.ORGANIC, - "Phosphorus", - false, - new Color(0xFFC826), - new Color(0xC1C1F6), + PHOSPHORUS(GT_BranchDefinition.ORGANIC, "Phosphorus", false, new Color(0xFFC826), new Color(0xC1C1F6), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PHOSPHORUS), 0.55f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(APATITE, ASH, 12); tMutation.restrictTemperature(HOT); tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockgem2"), 8); }), // Tea bee, Humidity: normal, Parents: Ash and Fertilizer, Mutationrate: 10%, combrate: 10% - TEA( - GT_BranchDefinition.ORGANIC, - "Tea", - false, - new Color(0x65D13A), - new Color(0x9a9679), - beeSpecies -> { - beeSpecies.addProduct( - GT_ModHandler.getModItem("harvestcraft", "tealeafItem", 1, ItemList.Crop_Drop_TeaLeaf.get(1)), - 0.10f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(NORMAL); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), + TEA(GT_BranchDefinition.ORGANIC, "Tea", false, new Color(0x65D13A), new Color(0x9a9679), beeSpecies -> { + beeSpecies.addProduct( + GT_ModHandler.getModItem("harvestcraft", "tealeafItem", 1, ItemList.Crop_Drop_TeaLeaf.get(1)), + 0.10f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(NORMAL); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> dis.registerMutation(FERTILIZER, ASH, 10)), // Mica bee, Humidity: normal, Parents: Silicon & PEAT, Mutationrate: 15%, Combrate: 25% - MICA( - GT_BranchDefinition.ORGANIC, - "Mica", - false, - new Color(0xFFC826), - new Color(0xC1C1F6), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MICA), 0.25f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(HOT); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(PEAT, getSpecies(MAGICBEES, "Silicon"), 15); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockcasings5"), 0); - }), + MICA(GT_BranchDefinition.ORGANIC, "Mica", false, new Color(0xFFC826), new Color(0xC1C1F6), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MICA), 0.25f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(HOT); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(PEAT, getSpecies(MAGICBEES, "Silicon"), 15); + tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockcasings5"), 0); + }), // gems - REDSTONE( - GT_BranchDefinition.GEM, - "Redstone", - true, - new Color(0x7D0F0F), - new Color(0xD11919), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDSTONE), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RAREEARTH), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Demonic"), 10); - tMutation.requireResource("blockRedstone"); - }), - LAPIS( - GT_BranchDefinition.GEM, - "Lapis", - true, - new Color(0x1947D1), - new Color(0x476CDA), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LAPIS), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(FORESTRY, "Demonic"), getSpecies(FORESTRY, "Imperial"), 10); - tMutation.requireResource("blockLapis"); - }), - CERTUS( - GT_BranchDefinition.GEM, - "CertusQuartz", - true, - new Color(0x57CFFB), - new Color(0xBBEEFF), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CERTUS), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Hermitic"), LAPIS, 10); - if (Loader.isModLoaded("appliedenergistics2")) - tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), 0); - }), - FLUIX( - GT_BranchDefinition.GEM, - "FluixDust", - true, - new Color(0xA375FF), - new Color(0xB591FF), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FLUIX), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, LAPIS, 7); - if (Loader.isModLoaded("appliedenergistics2")) - tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockFluix"), 0); - }), - DIAMOND( - GT_BranchDefinition.GEM, - "Diamond", - false, - new Color(0xCCFFFF), - new Color(0xA3CCCC), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DIAMOND), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(HOT); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(CERTUS, COAL, 3); - tMutation.requireResource("blockDiamond"); - }), - RUBY( - GT_BranchDefinition.GEM, - "Ruby", - false, - new Color(0xE6005C), - new Color(0xCC0052), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.RUBY), 0.15f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.REDGARNET), 0.05f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, DIAMOND, 5); - tMutation.requireResource("blockRuby"); - }), - SAPPHIRE( - GT_BranchDefinition.GEM, - "Sapphire", - true, - new Color(0x0033CC), - new Color(0x00248F), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SAPPHIRE), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(CERTUS, LAPIS, 5); - tMutation.requireResource(GregTech_API.sBlockGem2, 12); - }), - OLIVINE( - GT_BranchDefinition.GEM, - "Olivine", - true, - new Color(0x248F24), - new Color(0xCCFFCC), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OLIVINE), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MAGNESIUM), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), + REDSTONE(GT_BranchDefinition.GEM, "Redstone", true, new Color(0x7D0F0F), new Color(0xD11919), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDSTONE), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RAREEARTH), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Demonic"), 10); + tMutation.requireResource("blockRedstone"); + }), + LAPIS(GT_BranchDefinition.GEM, "Lapis", true, new Color(0x1947D1), new Color(0x476CDA), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LAPIS), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(FORESTRY, "Demonic"), getSpecies(FORESTRY, "Imperial"), 10); + tMutation.requireResource("blockLapis"); + }), + CERTUS(GT_BranchDefinition.GEM, "CertusQuartz", true, new Color(0x57CFFB), new Color(0xBBEEFF), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CERTUS), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Hermitic"), LAPIS, 10); + if (Loader.isModLoaded("appliedenergistics2")) + tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), 0); + }), + FLUIX(GT_BranchDefinition.GEM, "FluixDust", true, new Color(0xA375FF), new Color(0xB591FF), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FLUIX), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, LAPIS, 7); + if (Loader.isModLoaded("appliedenergistics2")) + tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockFluix"), 0); + }), + DIAMOND(GT_BranchDefinition.GEM, "Diamond", false, new Color(0xCCFFFF), new Color(0xA3CCCC), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DIAMOND), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(HOT); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(CERTUS, COAL, 3); + tMutation.requireResource("blockDiamond"); + }), + RUBY(GT_BranchDefinition.GEM, "Ruby", false, new Color(0xE6005C), new Color(0xCC0052), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.RUBY), 0.15f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.REDGARNET), 0.05f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, DIAMOND, 5); + tMutation.requireResource("blockRuby"); + }), + SAPPHIRE(GT_BranchDefinition.GEM, "Sapphire", true, new Color(0x0033CC), new Color(0x00248F), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SAPPHIRE), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(CERTUS, LAPIS, 5); + tMutation.requireResource(GregTech_API.sBlockGem2, 12); + }), + OLIVINE(GT_BranchDefinition.GEM, "Olivine", true, new Color(0x248F24), new Color(0xCCFFCC), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OLIVINE), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MAGNESIUM), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> dis.registerMutation(CERTUS, getSpecies(FORESTRY, "Ended"), 5)), - EMERALD( - GT_BranchDefinition.GEM, - "Emerald", - false, - new Color(0x248F24), - new Color(0x2EB82E), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.EMERALD), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ALUMINIUM), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(OLIVINE, DIAMOND, 4); - tMutation.requireResource("blockEmerald"); - }), - REDGARNET( - GT_BranchDefinition.GEM, - "RedGarnet", - false, - new Color(0xBD4C4C), - new Color(0xECCECE), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDGARNET), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PYROPE), 0.05f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(WARM); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FAST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, RUBY, 4); - tMutation.requireResource("blockGarnetRed"); - }), - YELLOWGARNET( - GT_BranchDefinition.GEM, - "YellowGarnet", - false, - new Color(0xA3A341), - new Color(0xEDEDCE), + EMERALD(GT_BranchDefinition.GEM, "Emerald", false, new Color(0x248F24), new Color(0x2EB82E), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.EMERALD), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ALUMINIUM), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(OLIVINE, DIAMOND, 4); + tMutation.requireResource("blockEmerald"); + }), + REDGARNET(GT_BranchDefinition.GEM, "RedGarnet", false, new Color(0xBD4C4C), new Color(0xECCECE), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDGARNET), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PYROPE), 0.05f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(WARM); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FAST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, RUBY, 4); + tMutation.requireResource("blockGarnetRed"); + }), + YELLOWGARNET(GT_BranchDefinition.GEM, "YellowGarnet", false, new Color(0xA3A341), new Color(0xEDEDCE), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.YELLOWGARNET), 0.15f); @@ -548,848 +369,522 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(WARM); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.FAST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(EMERALD, REDGARNET, 3); tMutation.requireResource("blockGarnetYellow"); }), - FIRESTONE( - GT_BranchDefinition.GEM, - "Firestone", - false, - new Color(0xC00000), - new Color(0xFF0000), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIRESTONE), 0.15f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(WARM); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FAST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - AlleleHelper.instance.set(template, NOCTURNAL, true); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, RUBY, 4); - tMutation.requireResource("blockFirestone"); - }), + FIRESTONE(GT_BranchDefinition.GEM, "Firestone", false, new Color(0xC00000), new Color(0xFF0000), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIRESTONE), 0.15f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(WARM); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FAST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + AlleleHelper.instance.set(template, NOCTURNAL, true); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, RUBY, 4); + tMutation.requireResource("blockFirestone"); + }), // Metal Line - COPPER( - GT_BranchDefinition.METAL, - "Copper", - true, - new Color(0xFF6600), - new Color(0xE65C00), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.COPPER), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.GOLD), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Majestic"), CLAY, 13); - tMutation.requireResource("blockCopper"); - }), - TIN( - GT_BranchDefinition.METAL, - "Tin", - true, - new Color(0xD4D4D4), - new Color(0xDDDDDD), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TIN), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ZINC), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(CLAY, getSpecies(FORESTRY, "Diligent"), 13); - tMutation.requireResource("blockTin"); - }), - LEAD( - GT_BranchDefinition.METAL, - "Lead", - true, - new Color(0x666699), - new Color(0xA3A3CC), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LEAD), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SULFUR), 0.05f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(WARM); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(COAL, COPPER, 13); - tMutation.requireResource("blockLead"); - }), - IRON( - GT_BranchDefinition.METAL, - "Iron", - true, - new Color(0xDA9147), - new Color(0xDE9C59), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.IRON), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.TIN), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(TIN, COPPER, 13); - tMutation.requireResource("blockIron"); - }), - STEEL( - GT_BranchDefinition.METAL, - "Steel", - true, - new Color(0x808080), - new Color(0x999999), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STEEL), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRON), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(WARM); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(IRON, COAL, 10); - tMutation.requireResource("blockSteel"); - tMutation.restrictTemperature(HOT); - }), - NICKEL( - GT_BranchDefinition.METAL, - "Nickel", - true, - new Color(0x8585AD), - new Color(0x8585AD), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NICKEL), 0.15f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLATINUM), 0.02f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(IRON, COPPER, 13); - tMutation.requireResource("blockNickel"); - }), - ZINC( - GT_BranchDefinition.METAL, - "Zinc", - true, - new Color(0xF0DEF0), - new Color(0xF2E1F2), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ZINC), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.GALLIUM), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(IRON, TIN, 13); - tMutation.requireResource("blockZinc"); - }), - SILVER( - GT_BranchDefinition.METAL, - "Silver", - true, - new Color(0xC2C2D6), - new Color(0xCECEDE), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SILVER), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SULFUR), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(LEAD, TIN, 10); - tMutation.requireResource("blockSilver"); - }), - CRYOLITE( - GT_BranchDefinition.METAL, - "Cryolite", - true, - new Color(0xBFEFFF), - new Color(0x73B9D0), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CRYOLITE), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SILVER), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(WARM); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.FASTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(LEAD, SILVER, 9); - tMutation.requireResource("blockCryolite"); - }), - GOLD( - GT_BranchDefinition.METAL, - "Gold", - true, - new Color(0xEBC633), - new Color(0xEDCC47), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.GOLD), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NICKEL), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(WARM); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(LEAD, COPPER, 13); - tMutation.requireResource("blockGold"); - tMutation.restrictTemperature(HOT); - }), - ARSENIC( - GT_BranchDefinition.METAL, - "Arsenic", - true, - new Color(0x736C52), - new Color(0x292412), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ARSENIC), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(WARM); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(ZINC, SILVER, 10); - tMutation.requireResource("blockArsenic"); - }), + COPPER(GT_BranchDefinition.METAL, "Copper", true, new Color(0xFF6600), new Color(0xE65C00), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.COPPER), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.GOLD), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Majestic"), CLAY, 13); + tMutation.requireResource("blockCopper"); + }), + TIN(GT_BranchDefinition.METAL, "Tin", true, new Color(0xD4D4D4), new Color(0xDDDDDD), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TIN), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ZINC), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(CLAY, getSpecies(FORESTRY, "Diligent"), 13); + tMutation.requireResource("blockTin"); + }), + LEAD(GT_BranchDefinition.METAL, "Lead", true, new Color(0x666699), new Color(0xA3A3CC), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LEAD), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SULFUR), 0.05f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(WARM); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(COAL, COPPER, 13); + tMutation.requireResource("blockLead"); + }), + IRON(GT_BranchDefinition.METAL, "Iron", true, new Color(0xDA9147), new Color(0xDE9C59), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.IRON), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.TIN), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(TIN, COPPER, 13); + tMutation.requireResource("blockIron"); + }), + STEEL(GT_BranchDefinition.METAL, "Steel", true, new Color(0x808080), new Color(0x999999), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STEEL), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRON), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(WARM); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(IRON, COAL, 10); + tMutation.requireResource("blockSteel"); + tMutation.restrictTemperature(HOT); + }), + NICKEL(GT_BranchDefinition.METAL, "Nickel", true, new Color(0x8585AD), new Color(0x8585AD), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NICKEL), 0.15f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLATINUM), 0.02f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(IRON, COPPER, 13); + tMutation.requireResource("blockNickel"); + }), + ZINC(GT_BranchDefinition.METAL, "Zinc", true, new Color(0xF0DEF0), new Color(0xF2E1F2), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ZINC), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.GALLIUM), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(IRON, TIN, 13); + tMutation.requireResource("blockZinc"); + }), + SILVER(GT_BranchDefinition.METAL, "Silver", true, new Color(0xC2C2D6), new Color(0xCECEDE), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SILVER), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SULFUR), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(LEAD, TIN, 10); + tMutation.requireResource("blockSilver"); + }), + CRYOLITE(GT_BranchDefinition.METAL, "Cryolite", true, new Color(0xBFEFFF), new Color(0x73B9D0), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CRYOLITE), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SILVER), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(WARM); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.FASTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(LEAD, SILVER, 9); + tMutation.requireResource("blockCryolite"); + }), + GOLD(GT_BranchDefinition.METAL, "Gold", true, new Color(0xEBC633), new Color(0xEDCC47), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.GOLD), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NICKEL), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(WARM); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(LEAD, COPPER, 13); + tMutation.requireResource("blockGold"); + tMutation.restrictTemperature(HOT); + }), + ARSENIC(GT_BranchDefinition.METAL, "Arsenic", true, new Color(0x736C52), new Color(0x292412), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ARSENIC), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(WARM); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(ZINC, SILVER, 10); + tMutation.requireResource("blockArsenic"); + }), // Rare Metals - ALUMINIUM( - GT_BranchDefinition.RAREMETAL, - "Aluminium", - true, - new Color(0xB8B8FF), - new Color(0xD6D6FF), + ALUMINIUM(GT_BranchDefinition.RAREMETAL, "Aluminium", true, new Color(0xB8B8FF), new Color(0xD6D6FF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ALUMINIUM), 0.15f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.BAUXITE), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NICKEL, ZINC, 9); tMutation.requireResource("blockAluminium"); }), - TITANIUM( - GT_BranchDefinition.RAREMETAL, - "Titanium", - true, - new Color(0xCC99FF), - new Color(0xDBB8FF), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TITANIUM), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ALMANDINE), 0.05f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, ALUMINIUM, 5); - tMutation.requireResource(GregTech_API.sBlockMetal7, 9); - }), - GLOWSTONE( - GT_BranchDefinition.RAREMETAL, - "Glowstone", - false, - new Color(0xE5CA2A), - new Color(0xFFBC5E), + TITANIUM(GT_BranchDefinition.RAREMETAL, "Titanium", true, new Color(0xCC99FF), new Color(0xDBB8FF), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TITANIUM), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ALMANDINE), 0.05f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, ALUMINIUM, 5); + tMutation.requireResource(GregTech_API.sBlockMetal7, 9); + }), + GLOWSTONE(GT_BranchDefinition.RAREMETAL, "Glowstone", false, new Color(0xE5CA2A), new Color(0xFFBC5E), beeSpecies -> { beeSpecies.addSpecialty(Materials.Glowstone.getDust(1), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL), + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL), dis -> dis.registerMutation(REDSTONE, GOLD, 10)), - SUNNARIUM( - GT_BranchDefinition.RAREMETAL, - "Sunnarium", - false, - new Color(0xFFBC5E), - new Color(0xE5CA2A), + SUNNARIUM(GT_BranchDefinition.RAREMETAL, "Sunnarium", false, new Color(0xFFBC5E), new Color(0xE5CA2A), beeSpecies -> { beeSpecies.addProduct(Materials.Glowstone.getDust(1), 0.40f); beeSpecies.addSpecialty(Materials.Sunnarium.getDust(1), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST), - dis -> { + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(GLOWSTONE, GOLD, 5); tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockcasings"), 15); }), - CHROME( - GT_BranchDefinition.RAREMETAL, - "Chrome", - true, - new Color(0xEBA1EB), - new Color(0xF2C3F2), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CHROME), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MAGNESIUM), 0.05f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(TITANIUM, RUBY, 5); - tMutation.requireResource(GregTech_API.sBlockMetal2, 3); - }), - MANGANESE( - GT_BranchDefinition.RAREMETAL, - "Manganese", - true, - new Color(0xD5D5D5), - new Color(0xAAAAAA), + CHROME(GT_BranchDefinition.RAREMETAL, "Chrome", true, new Color(0xEBA1EB), new Color(0xF2C3F2), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CHROME), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MAGNESIUM), 0.05f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(TITANIUM, RUBY, 5); + tMutation.requireResource(GregTech_API.sBlockMetal2, 3); + }), + MANGANESE(GT_BranchDefinition.RAREMETAL, "Manganese", true, new Color(0xD5D5D5), new Color(0xAAAAAA), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MANGANESE), 0.15f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRON), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(TITANIUM, ALUMINIUM, 5); tMutation.requireResource(GregTech_API.sBlockMetal4, 6); }), - TUNGSTEN( - GT_BranchDefinition.RAREMETAL, - "Tungsten", - false, - new Color(0x5C5C8A), - new Color(0x7D7DA1), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TUNGSTEN), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MOLYBDENUM), 0.05f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Heroic"), MANGANESE, 5); - tMutation.requireResource(GregTech_API.sBlockMetal7, 11); - }), - PLATINUM( - GT_BranchDefinition.RAREMETAL, - "Platinum", - false, - new Color(0xE6E6E6), - new Color(0xFFFFCC), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLATINUM), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.02f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, CHROME, 5); - tMutation.requireResource("blockNickel"); - }), - IRIDIUM( - GT_BranchDefinition.RAREMETAL, - "Iridium", - false, - new Color(0xDADADA), - new Color(0xD1D1E0), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OSMIUM), 0.05f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(TUNGSTEN, PLATINUM, 5); - tMutation.requireResource(GregTech_API.sBlockMetal3, 12); - }), - OSMIUM( - GT_BranchDefinition.RAREMETAL, - "Osmium", - false, - new Color(0x2B2BDA), - new Color(0x8B8B8B), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OSMIUM), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.05f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(COLD); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(TUNGSTEN, PLATINUM, 5); - tMutation.requireResource(GregTech_API.sBlockMetal5, 9); - }), - SALTY( - GT_BranchDefinition.RAREMETAL, - "Salt", - true, - new Color(0xF0C8C8), - new Color(0xFAFAFA), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SALT), 0.35f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LITHIUM), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(WARM); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(CLAY, ALUMINIUM, 5); - tMutation.requireResource("blockSalt"); - }), - LITHIUM( - GT_BranchDefinition.RAREMETAL, - "Lithium", - false, - new Color(0xF0328C), - new Color(0xE1DCFF), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LITHIUM), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SALT), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(SALTY, ALUMINIUM, 5); - tMutation.requireResource("frameGtLithium"); - }), - ELECTROTINE( - GT_BranchDefinition.RAREMETAL, - "Electrotine", - false, - new Color(0x1E90FF), - new Color(0x3CB4C8), + TUNGSTEN(GT_BranchDefinition.RAREMETAL, "Tungsten", false, new Color(0x5C5C8A), new Color(0x7D7DA1), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TUNGSTEN), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MOLYBDENUM), 0.05f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Heroic"), MANGANESE, 5); + tMutation.requireResource(GregTech_API.sBlockMetal7, 11); + }), + PLATINUM(GT_BranchDefinition.RAREMETAL, "Platinum", false, new Color(0xE6E6E6), new Color(0xFFFFCC), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLATINUM), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.02f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, CHROME, 5); + tMutation.requireResource("blockNickel"); + }), + IRIDIUM(GT_BranchDefinition.RAREMETAL, "Iridium", false, new Color(0xDADADA), new Color(0xD1D1E0), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OSMIUM), 0.05f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(TUNGSTEN, PLATINUM, 5); + tMutation.requireResource(GregTech_API.sBlockMetal3, 12); + }), + OSMIUM(GT_BranchDefinition.RAREMETAL, "Osmium", false, new Color(0x2B2BDA), new Color(0x8B8B8B), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OSMIUM), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.05f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(COLD); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(TUNGSTEN, PLATINUM, 5); + tMutation.requireResource(GregTech_API.sBlockMetal5, 9); + }), + SALTY(GT_BranchDefinition.RAREMETAL, "Salt", true, new Color(0xF0C8C8), new Color(0xFAFAFA), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SALT), 0.35f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LITHIUM), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(WARM); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(CLAY, ALUMINIUM, 5); + tMutation.requireResource("blockSalt"); + }), + LITHIUM(GT_BranchDefinition.RAREMETAL, "Lithium", false, new Color(0xF0328C), new Color(0xE1DCFF), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LITHIUM), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SALT), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(SALTY, ALUMINIUM, 5); + tMutation.requireResource("frameGtLithium"); + }), + ELECTROTINE(GT_BranchDefinition.RAREMETAL, "Electrotine", false, new Color(0x1E90FF), new Color(0x3CB4C8), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ELECTROTINE), 0.15f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDSTONE), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), - dis -> { + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, GOLD, 5); tMutation.requireResource("blockElectrotine"); }), // Sulfur bee, Humidity: normal, Temperature: Hot, Parents: PEAT & Ash, Mutationrate: 15%, Combrate: 80% - SULFUR( - GT_BranchDefinition.RAREMETAL, - "Sulfur", - false, - new Color(0x1E90FF), - new Color(0x3CB4C8), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SULFUR), 0.70f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIRESTONE), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.NORMAL), + SULFUR(GT_BranchDefinition.RAREMETAL, "Sulfur", false, new Color(0x1E90FF), new Color(0x3CB4C8), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SULFUR), 0.70f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIRESTONE), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.NORMAL), dis -> dis.registerMutation(ASH, PEAT, 15)), - INDIUM( - GT_BranchDefinition.RAREMETAL, - "Indium", - false, - new Color(0xFFA9FF), - new Color(0x8F5D99), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INDIUM), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(LEAD, OSMIUM, 1); - tMutation.requireResource("blockIndium"); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim - }), + INDIUM(GT_BranchDefinition.RAREMETAL, "Indium", false, new Color(0xFFA9FF), new Color(0x8F5D99), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INDIUM), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(LEAD, OSMIUM, 1); + tMutation.requireResource("blockIndium"); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim + }), // IC2 - COOLANT( - GT_BranchDefinition.IC2, - "Coolant", - false, - new Color(0x144F5A), - new Color(0x2494A2), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COOLANT), 0.15f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(COLD); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOW); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectGlacial); - }, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(FORESTRY, "Icy"), getSpecies(FORESTRY, "Glacial"), 10); - tMutation.requireResource( - Block.getBlockFromItem(GT_ModHandler.getModItem("IC2", "fluidCoolant", 1) - .getItem()), - 0); - tMutation.restrictTemperature(ICY); - }), - ENERGY( - GT_BranchDefinition.IC2, - "Energy", - false, - new Color(0xC11F1F), - new Color(0xEBB9B9), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 12), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(WARM); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_2); - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.NETHER); - AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); - }, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(FORESTRY, "Demonic"), getSpecies(EXTRABEES, "volcanic"), 10); - tMutation.requireResource( - Block.getBlockFromItem(GT_ModHandler.getModItem("IC2", "fluidHotCoolant", 1) - .getItem()), - 0); - tMutation.addMutationCondition( - new GT_Bees.BiomeIDMutationCondition(128, "Boneyard Biome")); // Boneyard Biome - }), - LAPOTRON( - GT_BranchDefinition.IC2, - "Lapotron", - false, - new Color(0x6478FF), - new Color(0x1414FF), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LAPIS), 0.20f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LAPOTRON), 0.10f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(ICY); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1); - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); - AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(LAPIS, ENERGY, 6); - tMutation.requireResource("blockLapis"); - tMutation.restrictTemperature(ICY); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28, "Moon")); // moon dim - }), - PYROTHEUM( - GT_BranchDefinition.IC2, - "Pyrotheum", - false, - new Color(0xffebc4), - new Color(0xe36400), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.20f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PYROTHEUM), 0.15f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FASTEST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.NETHER); - AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, ENERGY, 4); - tMutation.restrictTemperature(HELLISH); - }), - CRYOTHEUM( - GT_BranchDefinition.IC2, - "Cryotheum", - false, - new Color(0x2660ff), - new Color(0x5af7ff), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BLIZZ), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CRYOTHEUM), 0.20f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(ICY); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectSnowing); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); - AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, COOLANT, 4); - tMutation.restrictTemperature(ICY); - }), - Explosive( - GT_BranchDefinition.IC2, - "explosive", - false, - new Color(0x7E270F), - new Color(0x747474), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getIC2Item("industrialTnt", 1L), 0.5f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectSnowing); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); - AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(FIRESTONE, COAL, 4); - tMutation.requireResource(GameRegistry.findBlock("IC2", "blockITNT"), 0); - }), + COOLANT(GT_BranchDefinition.IC2, "Coolant", false, new Color(0x144F5A), new Color(0x2494A2), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COOLANT), 0.15f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(COLD); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOW); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectGlacial); + }, dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(FORESTRY, "Icy"), getSpecies(FORESTRY, "Glacial"), 10); + tMutation.requireResource( + Block.getBlockFromItem(GT_ModHandler.getModItem("IC2", "fluidCoolant", 1).getItem()), + 0); + tMutation.restrictTemperature(ICY); + }), + ENERGY(GT_BranchDefinition.IC2, "Energy", false, new Color(0xC11F1F), new Color(0xEBB9B9), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 12), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(WARM); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_2); + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.NETHER); + AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); + }, dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(FORESTRY, "Demonic"), getSpecies(EXTRABEES, "volcanic"), 10); + tMutation.requireResource( + Block.getBlockFromItem(GT_ModHandler.getModItem("IC2", "fluidHotCoolant", 1).getItem()), + 0); + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(128, "Boneyard Biome")); // Boneyard Biome + }), + LAPOTRON(GT_BranchDefinition.IC2, "Lapotron", false, new Color(0x6478FF), new Color(0x1414FF), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LAPIS), 0.20f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LAPOTRON), 0.10f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(ICY); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1); + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); + AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(LAPIS, ENERGY, 6); + tMutation.requireResource("blockLapis"); + tMutation.restrictTemperature(ICY); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28, "Moon")); // moon dim + }), + PYROTHEUM(GT_BranchDefinition.IC2, "Pyrotheum", false, new Color(0xffebc4), new Color(0xe36400), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.20f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PYROTHEUM), 0.15f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FASTEST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.NETHER); + AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, ENERGY, 4); + tMutation.restrictTemperature(HELLISH); + }), + CRYOTHEUM(GT_BranchDefinition.IC2, "Cryotheum", false, new Color(0x2660ff), new Color(0x5af7ff), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BLIZZ), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CRYOTHEUM), 0.20f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(ICY); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectSnowing); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); + AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, COOLANT, 4); + tMutation.restrictTemperature(ICY); + }), + Explosive(GT_BranchDefinition.IC2, "explosive", false, new Color(0x7E270F), new Color(0x747474), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getIC2Item("industrialTnt", 1L), 0.5f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectSnowing); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); + AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(FIRESTONE, COAL, 4); + tMutation.requireResource(GameRegistry.findBlock("IC2", "blockITNT"), 0); + }), // Alloy - REDALLOY( - GT_BranchDefinition.GTALLOY, - "RedAlloy", - false, - new Color(0xE60000), - new Color(0xB80000), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 7), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDALLOY), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTER); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(COPPER, REDSTONE, 10); - tMutation.requireResource("blockRedAlloy"); - }), - REDSTONEALLOY( - GT_BranchDefinition.GTALLOY, - "RedStoneAlloy", - false, - new Color(0xA50808), - new Color(0xE80000), + REDALLOY(GT_BranchDefinition.GTALLOY, "RedAlloy", false, new Color(0xE60000), new Color(0xB80000), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 7), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDALLOY), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTER); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(COPPER, REDSTONE, 10); + tMutation.requireResource("blockRedAlloy"); + }), + REDSTONEALLOY(GT_BranchDefinition.GTALLOY, "RedStoneAlloy", false, new Color(0xA50808), new Color(0xE80000), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDSTONEALLOY), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTER); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, REDALLOY, 8); tMutation.requireResource("blockRedstoneAlloy"); }), - CONDUCTIVEIRON( - GT_BranchDefinition.GTALLOY, - "ConductiveIron", - false, - new Color(0xCEADA3), - new Color(0x817671), + CONDUCTIVEIRON(GT_BranchDefinition.GTALLOY, "ConductiveIron", false, new Color(0xCEADA3), new Color(0x817671), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CONDUCTIVEIRON), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(WARM); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.FAST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(REDSTONEALLOY, IRON, 8); tMutation.requireResource("blockConductiveIron"); }), - ENERGETICALLOY( - GT_BranchDefinition.GTALLOY, - "EnergeticAlloy", - false, - new Color(0xFF9933), - new Color(0xFFAD5C), + ENERGETICALLOY(GT_BranchDefinition.GTALLOY, "EnergeticAlloy", false, new Color(0xFF9933), new Color(0xFFAD5C), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGETICALLOY), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.FAST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(REDSTONEALLOY, getSpecies(FORESTRY, "Demonic"), 9); tMutation.requireResource("blockEnergeticAlloy"); }), - VIBRANTALLOY( - GT_BranchDefinition.GTALLOY, - "VibrantAlloy", - false, - new Color(0x86A12D), - new Color(0xC4F2AE), + VIBRANTALLOY(GT_BranchDefinition.GTALLOY, "VibrantAlloy", false, new Color(0x86A12D), new Color(0xC4F2AE), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.VIBRANTALLOY), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); AlleleHelper.instance.set(template, FLOWERING, Flowering.FAST); - }, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(ENERGETICALLOY, getSpecies(FORESTRY, "Phantasmal"), 6); + }, dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(ENERGETICALLOY, getSpecies(FORESTRY, "Phantasmal"), 6); tMutation.requireResource("blockVibrantAlloy"); tMutation.restrictTemperature(HOT, HELLISH); }), - ELECTRICALSTEEL( - GT_BranchDefinition.GTALLOY, - "ElectricalSteel", - false, - new Color(0x787878), - new Color(0xD8D8D8), + ELECTRICALSTEEL(GT_BranchDefinition.GTALLOY, "ElectricalSteel", false, new Color(0x787878), new Color(0xD8D8D8), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ELECTRICALSTEEL), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTER); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(STEEL, getSpecies(FORESTRY, "Demonic"), 9); tMutation.requireResource("blockElectricalSteel"); }), - DARKSTEEL( - GT_BranchDefinition.GTALLOY, - "DarkSteel", - false, - new Color(0x252525), - new Color(0x443B44), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 7), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DARKSTEEL), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FAST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(ELECTRICALSTEEL, getSpecies(FORESTRY, "Demonic"), 7); - tMutation.requireResource("blockDarkSteel"); - }), - PULSATINGIRON( - GT_BranchDefinition.GTALLOY, - "PulsatingIron", - false, - new Color(0x6DD284), - new Color(0x006600), + DARKSTEEL(GT_BranchDefinition.GTALLOY, "DarkSteel", false, new Color(0x252525), new Color(0x443B44), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 7), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DARKSTEEL), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FAST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(ELECTRICALSTEEL, getSpecies(FORESTRY, "Demonic"), 7); + tMutation.requireResource("blockDarkSteel"); + }), + PULSATINGIRON(GT_BranchDefinition.GTALLOY, "PulsatingIron", false, new Color(0x6DD284), new Color(0x006600), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PULSATINGIRON), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.FAST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(REDALLOY, getSpecies(FORESTRY, "Ended"), 9); tMutation.requireResource("blockPulsatingIron"); }), - STAINLESSSTEEL( - GT_BranchDefinition.GTALLOY, - "StainlessSteel", - false, - new Color(0xC8C8DC), - new Color(0x778899), + STAINLESSSTEEL(GT_BranchDefinition.GTALLOY, "StainlessSteel", false, new Color(0xC8C8DC), new Color(0x778899), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STEEL), 0.10f); @@ -1397,254 +892,179 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CHROME), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(HOT); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.FAST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(CHROME, STEEL, 9); tMutation.requireResource("blockStainlessSteel"); }), - ENDERIUM( - GT_BranchDefinition.GTALLOY, - "Enderium", - false, - new Color(0x599087), - new Color(0x2E8B57), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDERIUM), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CHROME), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(HOT); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding); - AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "teleport")); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(PLATINUM, getSpecies(FORESTRY, "Phantasmal"), 3); - tMutation.requireResource("blockEnderium"); - }), - BEDROCKIUM( - GT_BranchDefinition.GTALLOY, - "Bedrockium", - false, - new Color(0x0C0C0C), - new Color(0xC6C6C6), + ENDERIUM(GT_BranchDefinition.GTALLOY, "Enderium", false, new Color(0x599087), new Color(0x2E8B57), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDERIUM), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CHROME), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(HOT); + }, template -> { + AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding); + AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "teleport")); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(PLATINUM, getSpecies(FORESTRY, "Phantasmal"), 3); + tMutation.requireResource("blockEnderium"); + }), + BEDROCKIUM(GT_BranchDefinition.GTALLOY, "Bedrockium", false, new Color(0x0C0C0C), new Color(0xC6C6C6), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.BEDROCKIUM), 0.55f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(HOT); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOW); AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "gravity")); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(Explosive, DIAMOND, 2); if (Loader.isModLoaded("ExtraUtilities")) tMutation.requireResource(GameRegistry.findBlock("ExtraUtilities", "block_bedrockium"), 0); }), // thaumic - THAUMIUMDUST( - GT_BranchDefinition.THAUMIC, - "ThaumiumDust", - true, - new Color(0x7A007A), - new Color(0x5C005C), + THAUMIUMDUST(GT_BranchDefinition.THAUMIC, "ThaumiumDust", true, new Color(0x7A007A), new Color(0x5C005C), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMIUMDUST), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_2); AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectExploration); AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.UP_1); AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.JUNGLE); - }, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(MAGICBEES, "TCFire"), getSpecies(FORESTRY, "Edenic"), 10); + }, dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(MAGICBEES, "TCFire"), getSpecies(FORESTRY, "Edenic"), 10); tMutation.requireResource("blockThaumium"); - tMutation.addMutationCondition( - new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest")); // magical forest + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest")); // magical + // forest }), - THAUMIUMSHARD( - GT_BranchDefinition.THAUMIC, - "ThaumiumShard", - true, - new Color(0x9966FF), - new Color(0xAD85FF), + THAUMIUMSHARD(GT_BranchDefinition.THAUMIC, "ThaumiumShard", true, new Color(0x9966FF), new Color(0xAD85FF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.THAUMIUMDUST), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMIUMSHARD), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1); AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectGlacial); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMDUST, getSpecies(MAGICBEES, "TCWater"), 10); - tMutation.addMutationCondition( - new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest")); // magical forest - }), - AMBER( - GT_BranchDefinition.THAUMIC, - "Amber", - true, - new Color(0xEE7700), - new Color(0x774B15), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 3), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.AMBER), 0.20f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMDUST, STICKYRESIN, 10); - tMutation.requireResource("blockAmber"); - }), - QUICKSILVER( - GT_BranchDefinition.THAUMIC, - "Quicksilver", - true, - new Color(0x7A007A), - new Color(0x5C005C), + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest")); // magical + // forest + }), + AMBER(GT_BranchDefinition.THAUMIC, "Amber", true, new Color(0xEE7700), new Color(0x774B15), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 3), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.AMBER), 0.20f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMDUST, STICKYRESIN, 10); + tMutation.requireResource("blockAmber"); + }), + QUICKSILVER(GT_BranchDefinition.THAUMIC, "Quicksilver", true, new Color(0x7A007A), new Color(0x5C005C), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.QUICKSILVER), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1); AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.UP_1); AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.JUNGLE); AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectMiasmic); - }, - dis -> dis.registerMutation(THAUMIUMDUST, SILVER, 10)), - SALISMUNDUS( - GT_BranchDefinition.THAUMIC, - "SalisMundus", - true, - new Color(0xF7ADDE), - new Color(0x592582), + }, dis -> dis.registerMutation(THAUMIUMDUST, SILVER, 10)), + SALISMUNDUS(GT_BranchDefinition.THAUMIC, "SalisMundus", true, new Color(0xF7ADDE), new Color(0x592582), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1); AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.UP_1); AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.JUNGLE); AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectMiasmic); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMDUST, THAUMIUMSHARD, 8); - tMutation.addMutationCondition( - new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest")); // magical forest - }), - TAINTED( - GT_BranchDefinition.THAUMIC, - "Tainted", - true, - new Color(0x904BB8), - new Color(0xE800FF), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 3), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.TAINTED), 0.20f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, CAVE_DWELLING, true); - AlleleHelper.instance.set(template, TOLERANT_FLYER, true); - AlleleHelper.instance.set(template, FERTILITY, Fertility.LOW); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMDUST, THAUMIUMSHARD, 7); - tMutation.addMutationCondition( - new GT_Bees.BiomeIDMutationCondition(193, "Tainted Land")); // Tainted Land - }), - MITHRIL( - GT_BranchDefinition.THAUMIC, - "Mithril", - true, - new Color(0xF0E68C), - new Color(0xFFFFD2), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLATINUM), 0.20f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MITHRIL), 0.125f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, CAVE_DWELLING, true); - AlleleHelper.instance.set(template, TOLERANT_FLYER, true); - AlleleHelper.instance.set(template, FERTILITY, Fertility.LOW); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); - }, - new Consumer<GT_BeeDefinition>() { - @Override - public void accept(GT_BeeDefinition dis) { - IBeeMutationCustom tMutation = dis.registerMutation(IO, PLATINUM, 7); - tMutation.requireResource(GregTech_API.sBlockMetal4, 10); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim - } - }), - ASTRALSILVER( - GT_BranchDefinition.THAUMIC, - "AstralSilver", - true, - new Color(0xAFEEEE), - new Color(0xE6E6FF), + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest")); // magical + // forest + }), + TAINTED(GT_BranchDefinition.THAUMIC, "Tainted", true, new Color(0x904BB8), new Color(0xE800FF), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 3), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.TAINTED), 0.20f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, CAVE_DWELLING, true); + AlleleHelper.instance.set(template, TOLERANT_FLYER, true); + AlleleHelper.instance.set(template, FERTILITY, Fertility.LOW); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMDUST, THAUMIUMSHARD, 7); + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(193, "Tainted Land")); // Tainted Land + }), + MITHRIL(GT_BranchDefinition.THAUMIC, "Mithril", true, new Color(0xF0E68C), new Color(0xFFFFD2), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLATINUM), 0.20f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MITHRIL), 0.125f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> { + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, CAVE_DWELLING, true); + AlleleHelper.instance.set(template, TOLERANT_FLYER, true); + AlleleHelper.instance.set(template, FERTILITY, Fertility.LOW); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); + }, new Consumer<GT_BeeDefinition>() { + + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(IO, PLATINUM, 7); + tMutation.requireResource(GregTech_API.sBlockMetal4, 10); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim + } + }), + ASTRALSILVER(GT_BranchDefinition.THAUMIC, "AstralSilver", true, new Color(0xAFEEEE), new Color(0xE6E6FF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SILVER), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ASTRALSILVER), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, NOCTURNAL, true); AlleleHelper.instance.set(template, CAVE_DWELLING, true); AlleleHelper.instance.set(template, TOLERANT_FLYER, true); @@ -1653,119 +1073,82 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SILVER, IRON, 3); tMutation.requireResource(GregTech_API.sBlockMetal1, 6); }), - THAUMINITE( - GT_BranchDefinition.THAUMIC, - "Thauminite", - true, - new Color(0x2E2D79), - new Color(0x7581E0), + THAUMINITE(GT_BranchDefinition.THAUMIC, "Thauminite", true, new Color(0x2E2D79), new Color(0x7581E0), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "comb", 1, 19), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMINITE), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOW); AlleleHelper.instance.set(template, NOCTURNAL, true); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "TCOrder"), THAUMIUMDUST, 8); if (Loader.isModLoaded("thaumicbases")) tMutation.requireResource(GameRegistry.findBlock("thaumicbases", "thauminiteBlock"), 0); }), - SHADOWMETAL( - GT_BranchDefinition.THAUMIC, - "ShadowMetal", - true, - new Color(0x100322), - new Color(0x100342), + SHADOWMETAL(GT_BranchDefinition.THAUMIC, "ShadowMetal", true, new Color(0x100322), new Color(0x100342), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "comb", 1, 20), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SHADOWMETAL), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOW); AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); AlleleHelper.instance.set(template, NOCTURNAL, true); - }, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(MAGICBEES, "TCChaos"), getSpecies(MAGICBEES, "TCVoid"), 6); + }, dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(MAGICBEES, "TCChaos"), getSpecies(MAGICBEES, "TCVoid"), 6); if (Loader.isModLoaded("TaintedMagic")) tMutation.requireResource("blockShadow"); }), - DIVIDED( - GT_BranchDefinition.THAUMIC, - "Unstable", - true, - new Color(0xF0F0F0), - new Color(0xDCDCDC), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 61), 0.20f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DIVIDED), 0.125f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); - AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOW); - AlleleHelper.instance.set(template, NOCTURNAL, true); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, IRON, 3); - if (Loader.isModLoaded("ExtraUtilities")) - tMutation.requireResource(GameRegistry.findBlock("ExtraUtilities", "decorativeBlock1"), 5); - }), - CAELESTIS( - GT_BranchDefinition.THAUMIC, - "Caelestis", - true, - new Color(0xF0F0F0), - new Color(0xDCDCDC), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISRED), 0.60f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISBLUE), 0.60f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISGREEN), 0.60f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); - AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOW); - AlleleHelper.instance.set(template, NOCTURNAL, true); - }, - dis -> dis.registerMutation(DIAMOND, DIVIDED, 10)), - SPARKELING( - GT_BranchDefinition.THAUMIC, - "NetherStar", - true, - new Color(0x7A007A), - new Color(0xFFFFFF), + DIVIDED(GT_BranchDefinition.THAUMIC, "Unstable", true, new Color(0xF0F0F0), new Color(0xDCDCDC), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 61), 0.20f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DIVIDED), 0.125f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); + AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOW); + AlleleHelper.instance.set(template, NOCTURNAL, true); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, IRON, 3); + if (Loader.isModLoaded("ExtraUtilities")) + tMutation.requireResource(GameRegistry.findBlock("ExtraUtilities", "decorativeBlock1"), 5); + }), + CAELESTIS(GT_BranchDefinition.THAUMIC, "Caelestis", true, new Color(0xF0F0F0), new Color(0xDCDCDC), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISRED), 0.60f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISBLUE), 0.60f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISGREEN), 0.60f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWER); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); + AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOW); + AlleleHelper.instance.set(template, NOCTURNAL, true); + }, dis -> dis.registerMutation(DIAMOND, DIVIDED, 10)), + SPARKELING(GT_BranchDefinition.THAUMIC, "NetherStar", true, new Color(0x7A007A), new Color(0xFFFFFF), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 3), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SPARKELING), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_2); AlleleHelper.instance.set(template, NOCTURNAL, true); AlleleHelper.instance.set(template, CAVE_DWELLING, true); @@ -1773,65 +1156,43 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectAggressive); AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); - }, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(MAGICBEES, "Withering"), getSpecies(MAGICBEES, "Draconic"), 1); + }, dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(MAGICBEES, "Withering"), getSpecies(MAGICBEES, "Draconic"), 1); tMutation.requireResource(GregTech_API.sBlockGem3, 3); tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Biome")); // sky end biome }), - ESSENTIA( - GT_BranchDefinition.THAUMIC, - "Essentia", - true, - new Color(0x7A007A), - new Color(0xFFFFFF), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 3), 0.20f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - }, - template -> { - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_2); - AlleleHelper.instance.set(template, CAVE_DWELLING, true); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.VANILLA); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectReanimation); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(SHADOWMETAL, SPARKELING, 5); - if (Loader.isModLoaded("Thaumcraft")) - tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 6); - }), + ESSENTIA(GT_BranchDefinition.THAUMIC, "Essentia", true, new Color(0x7A007A), new Color(0xFFFFFF), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 3), 0.20f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + }, template -> { + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_2); + AlleleHelper.instance.set(template, CAVE_DWELLING, true); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.VANILLA); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectReanimation); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(SHADOWMETAL, SPARKELING, 5); + if (Loader.isModLoaded("Thaumcraft")) + tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 6); + }), // radioctive - URANIUM( - GT_BranchDefinition.RADIOACTIVE, - "Uranium", - true, - new Color(0x19AF19), - new Color(0x169E16), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.URANIUM), 0.15f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - beeSpecies.setNocturnal(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Avenging"), PLATINUM, 3); - tMutation.requireResource(GregTech_API.sBlockMetal7, 14); - }), - PLUTONIUM( - GT_BranchDefinition.RADIOACTIVE, - "Plutonium", - true, - new Color(0x570000), - new Color(0x240000), + URANIUM(GT_BranchDefinition.RADIOACTIVE, "Uranium", true, new Color(0x19AF19), new Color(0x169E16), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.URANIUM), 0.15f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + beeSpecies.setNocturnal(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Avenging"), PLATINUM, 3); + tMutation.requireResource(GregTech_API.sBlockMetal7, 14); + }), + PLUTONIUM(GT_BranchDefinition.RADIOACTIVE, "Plutonium", true, new Color(0x570000), new Color(0x240000), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LEAD), 0.15f); @@ -1839,21 +1200,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(URANIUM, EMERALD, 3); tMutation.requireResource(GregTech_API.sBlockMetal5, 13); }), - NAQUADAH( - GT_BranchDefinition.RADIOACTIVE, - "Naquadah", - false, - new Color(0x003300), - new Color(0x002400), + NAQUADAH(GT_BranchDefinition.RADIOACTIVE, "Naquadah", false, new Color(0x003300), new Color(0x002400), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAQUADAH), 0.15f); @@ -1861,21 +1215,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(PLUTONIUM, IRIDIUM, 3); tMutation.requireResource(GregTech_API.sBlockMetal4, 12); }), - NAQUADRIA( - GT_BranchDefinition.RADIOACTIVE, - "Naquadria", - false, - new Color(0x000000), - new Color(0x002400), + NAQUADRIA(GT_BranchDefinition.RADIOACTIVE, "Naquadria", false, new Color(0x000000), new Color(0x002400), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAQUADAH), 0.20f); @@ -1884,87 +1231,56 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(PLUTONIUM, IRIDIUM, 8, 10); tMutation.requireResource(GregTech_API.sBlockMetal4, 15); }), - DOB( - GT_BranchDefinition.RADIOACTIVE, - "DOB", - false, - new Color(0x003300), - new Color(0x002400), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.DOB), 0.75f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FAST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(NAQUADAH, THAUMIUMSHARD, 2); - if (Loader.isModLoaded("AdvancedSolarPanel")) - tMutation.requireResource(GameRegistry.findBlock("AdvancedSolarPanel", "BlockAdvSolarPanel"), 2); - tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Biome")); // sky end biome - }), - THORIUM( - GT_BranchDefinition.RADIOACTIVE, - "Thorium", - false, - new Color(0x005000), - new Color(0x001E00), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.THORIUM), 0.75f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - beeSpecies.setNocturnal(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); - }, - dis -> { - IMutationCustom tMutation = - dis.registerMutation(COAL, URANIUM, 3).setIsSecret(); - tMutation.requireResource(GregTech_API.sBlockMetal7, 5); - }), - LUTETIUM( - GT_BranchDefinition.RADIOACTIVE, - "Lutetium", - false, - new Color(0xE6FFE6), - new Color(0xFFFFFF), + DOB(GT_BranchDefinition.RADIOACTIVE, "DOB", false, new Color(0x003300), new Color(0x002400), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.DOB), 0.75f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FAST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(NAQUADAH, THAUMIUMSHARD, 2); + if (Loader.isModLoaded("AdvancedSolarPanel")) + tMutation.requireResource(GameRegistry.findBlock("AdvancedSolarPanel", "BlockAdvSolarPanel"), 2); + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Biome")); // sky end biome + }), + THORIUM(GT_BranchDefinition.RADIOACTIVE, "Thorium", false, new Color(0x005000), new Color(0x001E00), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.THORIUM), 0.75f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + beeSpecies.setNocturnal(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); + }, dis -> { + IMutationCustom tMutation = dis.registerMutation(COAL, URANIUM, 3).setIsSecret(); + tMutation.requireResource(GregTech_API.sBlockMetal7, 5); + }), + LUTETIUM(GT_BranchDefinition.RADIOACTIVE, "Lutetium", false, new Color(0xE6FFE6), new Color(0xFFFFFF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LUTETIUM), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); - }, - dis -> { + }, dis -> { IMutationCustom tMutation = dis.registerMutation(THORIUM, getSpecies(EXTRABEES, "rotten"), 1) .setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal4, 3); }), - AMERICIUM( - GT_BranchDefinition.RADIOACTIVE, - "Americium", - false, - new Color(0xE6E6FF), - new Color(0xC8C8C8), + AMERICIUM(GT_BranchDefinition.RADIOACTIVE, "Americium", false, new Color(0xE6E6FF), new Color(0xC8C8C8), beeSpecies -> { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.AMERICIUM), 0.075f); beeSpecies.setHumidity(EnumHumidity.NORMAL); @@ -1973,480 +1289,320 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); - }, - dis -> { - IMutationCustom tMutation = - dis.registerMutation(LUTETIUM, CHROME, 5, 4).setIsSecret(); + }, dis -> { + IMutationCustom tMutation = dis.registerMutation(LUTETIUM, CHROME, 5, 4).setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal1, 2); }), - NEUTRONIUM( - GT_BranchDefinition.RADIOACTIVE, - "Neutronium", - false, - new Color(0xFFF0F0), - new Color(0xFAFAFA), + NEUTRONIUM(GT_BranchDefinition.RADIOACTIVE, "Neutronium", false, new Color(0xFFF0F0), new Color(0xFAFAFA), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEUTRONIUM), 0.02f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(HELLISH); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); AlleleHelper.instance.set(template, NOCTURNAL, true); - }, - dis -> { - IMutationCustom tMutation = - dis.registerMutation(NAQUADRIA, AMERICIUM, 2, 2).setIsSecret(); + }, dis -> { + IMutationCustom tMutation = dis.registerMutation(NAQUADRIA, AMERICIUM, 2, 2).setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal5, 2); }), // Twilight - NAGA( - GT_BranchDefinition.TWILIGHT, - "Naga", - true, - new Color(0x0D5A0D), - new Color(0x28874B), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.02f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAGA), 0.10f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FAST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(MAGICBEES, "Eldritch"), getSpecies(FORESTRY, "Imperial"), 8); - tMutation.restrictHumidity(DAMP); - }), - LICH( - GT_BranchDefinition.TWILIGHT, - "Lich", - true, - new Color(0xC5C5C5), - new Color(0x5C605E), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.04f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LICH), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FAST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "Supernatural"), NAGA, 7); - tMutation.restrictHumidity(ARID); - }), - HYDRA( - GT_BranchDefinition.TWILIGHT, - "Hydra", - true, - new Color(0x872836), - new Color(0xB8132C), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.06f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.HYDRA), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FAST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(LICH, getSpecies(MAGICBEES, "TCFire"), 6); - tMutation.addMutationCondition( - new GT_Bees.BiomeIDMutationCondition(138, "Undergarden")); // undergarden biome - }), - URGHAST( - GT_BranchDefinition.TWILIGHT, - "UrGhast", - true, - new Color(0xA7041C), - new Color(0x7C0618), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.08f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.URGHAST), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - beeSpecies.setHasEffect(); - beeSpecies.setNocturnal(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FAST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(HYDRA, THAUMIUMDUST, 5); - if (Loader.isModLoaded("Thaumcraft")) - tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4); - tMutation.restrictTemperature(HELLISH); - }), - SNOWQUEEN( - GT_BranchDefinition.TWILIGHT, - "SnowQueen", - true, - new Color(0xD02001), - new Color(0x9C0018), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.15f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SNOWQUEEN), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(ICY); - beeSpecies.setHasEffect(); - beeSpecies.setNocturnal(); - }, - template -> {}, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(URGHAST, SALISMUNDUS, 4); - if (Loader.isModLoaded("thaumicbases")) - tMutation.requireResource(GameRegistry.findBlock("thaumicbases", "blockSalisMundus"), 0); - tMutation.restrictTemperature(ICY); - }), + NAGA(GT_BranchDefinition.TWILIGHT, "Naga", true, new Color(0x0D5A0D), new Color(0x28874B), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.02f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAGA), 0.10f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FAST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + }, dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(MAGICBEES, "Eldritch"), getSpecies(FORESTRY, "Imperial"), 8); + tMutation.restrictHumidity(DAMP); + }), + LICH(GT_BranchDefinition.TWILIGHT, "Lich", true, new Color(0xC5C5C5), new Color(0x5C605E), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.04f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LICH), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FAST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "Supernatural"), NAGA, 7); + tMutation.restrictHumidity(ARID); + }), + HYDRA(GT_BranchDefinition.TWILIGHT, "Hydra", true, new Color(0x872836), new Color(0xB8132C), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.06f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.HYDRA), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FAST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(LICH, getSpecies(MAGICBEES, "TCFire"), 6); + tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(138, "Undergarden")); // undergarden biome + }), + URGHAST(GT_BranchDefinition.TWILIGHT, "UrGhast", true, new Color(0xA7041C), new Color(0x7C0618), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.08f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.URGHAST), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + beeSpecies.setHasEffect(); + beeSpecies.setNocturnal(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FAST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(HYDRA, THAUMIUMDUST, 5); + if (Loader.isModLoaded("Thaumcraft")) + tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4); + tMutation.restrictTemperature(HELLISH); + }), + SNOWQUEEN(GT_BranchDefinition.TWILIGHT, "SnowQueen", true, new Color(0xD02001), new Color(0x9C0018), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SNOWQUEEN), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(ICY); + beeSpecies.setHasEffect(); + beeSpecies.setNocturnal(); + }, template -> {}, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(URGHAST, SALISMUNDUS, 4); + if (Loader.isModLoaded("thaumicbases")) + tMutation.requireResource(GameRegistry.findBlock("thaumicbases", "blockSalisMundus"), 0); + tMutation.restrictTemperature(ICY); + }), // HEE - ENDDUST( - GT_BranchDefinition.HEE, - "End Dust", - true, - new Color(0xCC00FA), - new Color(0x003A7D), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDDUST), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), STAINLESSSTEEL, 8); + ENDDUST(GT_BranchDefinition.HEE, "End Dust", true, new Color(0xCC00FA), new Color(0x003A7D), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDDUST), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), STAINLESSSTEEL, 8); - tMutation.restrictHumidity(ARID); - if (Loader.isModLoaded("HardcoreEnderExpansion")) - tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "end_powder_ore"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim - }), - ENDIUM( - GT_BranchDefinition.HEE, - "Endium", - true, - new Color(0xa0ffff), - new Color(0x2F5A6C), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDIUM), 0.10f); - beeSpecies.addSpecialty(GT_Bees.propolis.getStackForType(PropolisType.Endium), 0.15f); - beeSpecies.addSpecialty(GT_Bees.drop.getStackForType(DropType.ENDERGOO), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), THAUMIUMDUST, 8); - tMutation.restrictHumidity(ARID); - if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource("blockHeeEndium"); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim - }), - STARDUST( - GT_BranchDefinition.HEE, - "Star Dust", - true, - new Color(0xffff00), - new Color(0xDCBE13), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STARDUST), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); - AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOWER); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), ZINC, 8); - tMutation.restrictHumidity(ARID); - if (Loader.isModLoaded("HardcoreEnderExpansion")) - tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "stardust_ore"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim - }), - ECTOPLASMA( - GT_BranchDefinition.HEE, - "Ectoplasma", - true, - new Color(0xDCB0E5), - new Color(0x381C40), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ECTOPLASMA), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), ENDDUST, 5); - tMutation.restrictHumidity(ARID); - if (Loader.isModLoaded("HardcoreEnderExpansion")) - tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "spooky_log"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim - }), - ARCANESHARDS( - GT_BranchDefinition.HEE, - "Arcane Shards", - true, - new Color(0x9010AD), - new Color(0x333D82), + tMutation.restrictHumidity(ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "end_powder_ore"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim + }), + ENDIUM(GT_BranchDefinition.HEE, "Endium", true, new Color(0xa0ffff), new Color(0x2F5A6C), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDIUM), 0.10f); + beeSpecies.addSpecialty(GT_Bees.propolis.getStackForType(PropolisType.Endium), 0.15f); + beeSpecies.addSpecialty(GT_Bees.drop.getStackForType(DropType.ENDERGOO), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), THAUMIUMDUST, 8); + tMutation.restrictHumidity(ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource("blockHeeEndium"); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim + }), + STARDUST(GT_BranchDefinition.HEE, "Star Dust", true, new Color(0xffff00), new Color(0xDCBE13), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STARDUST), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); + AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOWER); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), ZINC, 8); + tMutation.restrictHumidity(ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "stardust_ore"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim + }), + ECTOPLASMA(GT_BranchDefinition.HEE, "Ectoplasma", true, new Color(0xDCB0E5), new Color(0x381C40), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ECTOPLASMA), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), ENDDUST, 5); + tMutation.restrictHumidity(ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "spooky_log"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim + }), + ARCANESHARDS(GT_BranchDefinition.HEE, "Arcane Shards", true, new Color(0x9010AD), new Color(0x333D82), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ARCANESHARD), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONG); AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMSHARD, ENDDUST, 5); tMutation.restrictHumidity(ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "laboratory_floor"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), - DRAGONESSENCE( - GT_BranchDefinition.HEE, - "Dragonessence", - true, - new Color(0xFFA12B), - new Color(0x911ECE), + DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, new Color(0xFFA12B), new Color(0x911ECE), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DRAGONESSENCE), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectBeatific); AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_3); AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_3); - }, - dis -> { + }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(ECTOPLASMA, ARCANESHARDS, 4); tMutation.restrictHumidity(ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "essence_altar"), 1); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), - FIREESSENCE( - GT_BranchDefinition.HEE, - "Fireessence", - true, - new Color(0xD41238), - new Color(0xFFA157), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIREESSENSE), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.ELONGATED); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_3); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.DOWN_3); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(FIRESTONE, ARCANESHARDS, 4); - tMutation.restrictHumidity(ARID); - if (Loader.isModLoaded("HardcoreEnderExpansion")) - tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "essence_altar"), 2); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim - }), - ENDERMANHEAD( - GT_BranchDefinition.HEE, - "Enderman", - true, - new Color(0x161616), - new Color(0x6200e7), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDERMAN), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); - AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "teleport")); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.UP_1); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(ENDERIUM, STARDUST, 4); - tMutation.restrictHumidity(ARID); - if (Loader.isModLoaded("HardcoreEnderExpansion")) - tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "ender_goo"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim - }), - SILVERFISH( - GT_BranchDefinition.HEE, - "Silverfisch", - true, - new Color(0xEE053D), - new Color(0x000000), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SILVERFISH), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); - AlleleHelper.instance.set(template, EFFECT, getEffect(MAGICBEES, "SlowSpeed")); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_1); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.DOWN_1); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(ECTOPLASMA, STARDUST, 5); - tMutation.restrictHumidity(ARID); - if (Loader.isModLoaded("HardcoreEnderExpansion")) - tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "ender_goo"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim - }), - RUNE( - GT_BranchDefinition.HEE, - "Rune", - true, - new Color(0xE31010), - new Color(0x0104D9), - beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEI), 0.025f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEII), 0.0125f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, LIFESPAN, GT_Bees.superLife); - AlleleHelper.instance.set(template, EFFECT, getEffect(MAGICBEES, "SlowSpeed")); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); - }, - dis -> { - IMutationCustom tMutation = - dis.registerMutation(DRAGONESSENCE, STARDUST, 2).setIsSecret(); - tMutation.restrictHumidity(ARID); - if (Loader.isModLoaded("EnderStorage")) - tMutation.requireResource(GameRegistry.findBlock("EnderStorage", "enderChest"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim - }), + FIREESSENCE(GT_BranchDefinition.HEE, "Fireessence", true, new Color(0xD41238), new Color(0xFFA157), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIREESSENSE), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.ELONGATED); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_3); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.DOWN_3); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(FIRESTONE, ARCANESHARDS, 4); + tMutation.restrictHumidity(ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "essence_altar"), 2); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim + }), + ENDERMANHEAD(GT_BranchDefinition.HEE, "Enderman", true, new Color(0x161616), new Color(0x6200e7), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDERMAN), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); + AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "teleport")); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.UP_1); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(ENDERIUM, STARDUST, 4); + tMutation.restrictHumidity(ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "ender_goo"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim + }), + SILVERFISH(GT_BranchDefinition.HEE, "Silverfisch", true, new Color(0xEE053D), new Color(0x000000), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SILVERFISH), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); + AlleleHelper.instance.set(template, EFFECT, getEffect(MAGICBEES, "SlowSpeed")); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_1); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.DOWN_1); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(ECTOPLASMA, STARDUST, 5); + tMutation.restrictHumidity(ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "ender_goo"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim + }), + RUNE(GT_BranchDefinition.HEE, "Rune", true, new Color(0xE31010), new Color(0x0104D9), beeSpecies -> { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEI), 0.025f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEII), 0.0125f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, LIFESPAN, GT_Bees.superLife); + AlleleHelper.instance.set(template, EFFECT, getEffect(MAGICBEES, "SlowSpeed")); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); + }, dis -> { + IMutationCustom tMutation = dis.registerMutation(DRAGONESSENCE, STARDUST, 2).setIsSecret(); + tMutation.restrictHumidity(ARID); + if (Loader.isModLoaded("EnderStorage")) + tMutation.requireResource(GameRegistry.findBlock("EnderStorage", "enderChest"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim + }), // Walrus Bee, 100% Combchance, Parents: Catty and Watery - WALRUS( - GT_BranchDefinition.PLANET, - "Walrus", - true, - new Color(0xD6D580), - new Color(0xB5CFC9), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.WALRUS), 1.00f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.FASTEST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); - AlleleHelper.instance.set(template, NOCTURNAL, true); - }, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(MAGICBEES, "Watery"), getSpecies(MAGICBEES, "Catty"), 45, 2); - if (Loader.isModLoaded("extracells")) - tMutation.requireResource(GameRegistry.findBlock("extracells", "walrus"), 0); - }), + WALRUS(GT_BranchDefinition.PLANET, "Walrus", true, new Color(0xD6D580), new Color(0xB5CFC9), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.WALRUS), 1.00f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.FASTEST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); + AlleleHelper.instance.set(template, NOCTURNAL, true); + }, dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(MAGICBEES, "Watery"), getSpecies(MAGICBEES, "Catty"), 45, 2); + if (Loader.isModLoaded("extracells")) + tMutation.requireResource(GameRegistry.findBlock("extracells", "walrus"), 0); + }), // Space Bees - SPACE( - GT_BranchDefinition.SPACE, - "Space", - true, - new Color(0x003366), - new Color(0xC0C0C0), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.02f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - }, - template -> {}, - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Heroic"), 10); - tMutation.restrictTemperature(ICY); - }), - METEORICIRON( - GT_BranchDefinition.SPACE, - "MeteoricIron", - true, - new Color(0x321928), - new Color(0x643250), + SPACE(GT_BranchDefinition.SPACE, "Space", true, new Color(0x003366), new Color(0xC0C0C0), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.02f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + }, template -> {}, dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Heroic"), 10); + tMutation.restrictTemperature(ICY); + }), + METEORICIRON(GT_BranchDefinition.SPACE, "MeteoricIron", true, new Color(0x321928), new Color(0x643250), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.04f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.METEORICIRON), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); - }, - template -> {}, - dis -> { + }, template -> {}, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SPACE, IRON, 9); tMutation.requireResource(GregTech_API.sBlockMetal4, 7); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28, "Moon")); // Moon Dim }), - DESH( - GT_BranchDefinition.SPACE, - "Desh", - false, - new Color(0x323232), - new Color(0x282828), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.06f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DESH), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - beeSpecies.setNocturnal(); - }, - template -> AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition), + DESH(GT_BranchDefinition.SPACE, "Desh", false, new Color(0x323232), new Color(0x282828), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.06f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DESH), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + beeSpecies.setNocturnal(); + }, template -> AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition), new Consumer<GT_BeeDefinition>() { + @Override public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(MARS, TITANIUM, 9); @@ -2454,21 +1610,15 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim } }), - LEDOX( - GT_BranchDefinition.SPACE, - "Ledox", - false, - new Color(0x0000CD), - new Color(0x0074FF), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.10f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LEDOX), 0.10f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), + LEDOX(GT_BranchDefinition.SPACE, "Ledox", false, new Color(0x0000CD), new Color(0x0074FF), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.10f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LEDOX), 0.10f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), new Consumer<GT_BeeDefinition>() { + @Override public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, LEAD, 7); @@ -2477,107 +1627,76 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim } }), - CALLISTOICE( - GT_BranchDefinition.SPACE, - "CallistoIce", - false, - new Color(0x0074FF), - new Color(0x1EB1FF), + CALLISTOICE(GT_BranchDefinition.SPACE, "CallistoIce", false, new Color(0x0074FF), new Color(0x1EB1FF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.10f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CALLISTOICE), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), + }, template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), new Consumer<GT_BeeDefinition>() { + @Override public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, getSpecies(EXTRABEES, "freezing"), 7); if (Loader.isModLoaded(MOD_ID_DC)) tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.CallistoColdIce"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto Dim - } - }), - MYTRYL( - GT_BranchDefinition.SPACE, - "Mytryl", - false, - new Color(0xDAA520), - new Color(0xF26404), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.16f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MYTRYL), 0.10f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> {}, - new Consumer<GT_BeeDefinition>() { - @Override - public void accept(GT_BeeDefinition dis) { - IBeeMutationCustom tMutation = dis.registerMutation(IO, MITHRIL, 6); - if (Loader.isModLoaded(MOD_ID_DC)) - tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Mytryl"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto + // Dim } }), - QUANTIUM( - GT_BranchDefinition.SPACE, - "Quantium", - false, - new Color(0x00FF00), - new Color(0x00D10B), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.16f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.QUANTIUM), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> {}, - new Consumer<GT_BeeDefinition>() { - @Override - public void accept(GT_BeeDefinition dis) { - IBeeMutationCustom tMutation = dis.registerMutation(VENUS, OSMIUM, 6); - if (Loader.isModLoaded(MOD_ID_DC)) - tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Quantinum"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim - } - }), - ORIHARUKON( - GT_BranchDefinition.SPACE, - "Oriharukon", - false, - new Color(0x228B22), - new Color(0x677D68), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.26f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ORIHARUKON), 0.10f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(COLD); - beeSpecies.setHasEffect(); - }, - template -> {}, - new Consumer<GT_BeeDefinition>() { - @Override - public void accept(GT_BeeDefinition dis) { - IBeeMutationCustom tMutation = dis.registerMutation(LEAD, OBERON, 5); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "metalsblock"), 6); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim - } - }), - MYSTERIOUSCRYSTAL( - GT_BranchDefinition.SPACE, - "MysteriousCrystal", - false, - new Color(0x3CB371), - new Color(0x16856C), + MYTRYL(GT_BranchDefinition.SPACE, "Mytryl", false, new Color(0xDAA520), new Color(0xF26404), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.16f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MYTRYL), 0.10f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> {}, new Consumer<GT_BeeDefinition>() { + + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(IO, MITHRIL, 6); + if (Loader.isModLoaded(MOD_ID_DC)) + tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Mytryl"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim + } + }), + QUANTIUM(GT_BranchDefinition.SPACE, "Quantium", false, new Color(0x00FF00), new Color(0x00D10B), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.16f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.QUANTIUM), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> {}, new Consumer<GT_BeeDefinition>() { + + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(VENUS, OSMIUM, 6); + if (Loader.isModLoaded(MOD_ID_DC)) + tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Quantinum"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim + } + }), + ORIHARUKON(GT_BranchDefinition.SPACE, "Oriharukon", false, new Color(0x228B22), new Color(0x677D68), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.26f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ORIHARUKON), 0.10f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(COLD); + beeSpecies.setHasEffect(); + }, template -> {}, new Consumer<GT_BeeDefinition>() { + + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(LEAD, OBERON, 5); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "metalsblock"), 6); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim + } + }), + MYSTERIOUSCRYSTAL(GT_BranchDefinition.SPACE, "MysteriousCrystal", false, new Color(0x3CB371), new Color(0x16856C), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.42f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MYSTERIOUSCRYSTAL), 0.30f); @@ -2585,24 +1704,18 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> {}, - new Consumer<GT_BeeDefinition>() { + }, template -> {}, new Consumer<GT_BeeDefinition>() { + @Override public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(ENCELADUS, EMERALD, 3); if (Loader.isModLoaded(MOD_ID_DC)) tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.MysteriousCrystal"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus + // Dim } }), - BLACKPLUTONIUM( - GT_BranchDefinition.SPACE, - "BlackPlutonium", - false, - new Color(0x000000), - new Color(0x323232), + BLACKPLUTONIUM(GT_BranchDefinition.SPACE, "BlackPlutonium", false, new Color(0x000000), new Color(0x323232), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.68f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.BLACKPLUTONIUM), 0.10f); @@ -2610,9 +1723,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(HELLISH); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> {}, - new Consumer<GT_BeeDefinition>() { + }, template -> {}, new Consumer<GT_BeeDefinition>() { + @Override public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, PLUTONIUM, 2); @@ -2621,780 +1733,476 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim } }), - TRINIUM( - GT_BranchDefinition.SPACE, - "Trinium", - false, - new Color(0xB0E0E6), - new Color(0xC8C8D2), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TRINIUM), 0.75f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.QUANTIUM), 0.10f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding), - new Consumer<GT_BeeDefinition>() { - @Override - public void accept(GT_BeeDefinition dis) { - IBeeMutationCustom tMutation = dis.registerMutation(ENCELADUS, IRIDIUM, 4); - tMutation.requireResource(GregTech_API.sBlockMetal4, 9); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim - } - }), + TRINIUM(GT_BranchDefinition.SPACE, "Trinium", false, new Color(0xB0E0E6), new Color(0xC8C8D2), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TRINIUM), 0.75f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.QUANTIUM), 0.10f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding), new Consumer<GT_BeeDefinition>() { + + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(ENCELADUS, IRIDIUM, 4); + tMutation.requireResource(GregTech_API.sBlockMetal4, 9); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim + } + }), // Planet Line - MOON( - GT_BranchDefinition.PLANET, - "Moon", - false, - new Color(0x373735), - new Color(0x7E7E78), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MOON), 0.35f); - if (Loader.isModLoaded(MOD_ID_DC)) - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MoonStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(SPACE, CLAY, 25); - if (Loader.isModLoaded("GalacticraftCore")) - tMutation.requireResource(GameRegistry.findBlock("GalacticraftCore", "tile.moonBlock"), 4); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28, "Moon")); // Moon Dim - }), - MARS( - GT_BranchDefinition.PLANET, - "Mars", - false, - new Color(0x220D05), - new Color(0x3A1505), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MarsStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(MOON, IRON, 20); - if (Loader.isModLoaded("GalacticraftMars")) - tMutation.requireResource(GameRegistry.findBlock("GalacticraftMars", "tile.mars"), 5); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim - }), - PHOBOS( - GT_BranchDefinition.PLANET, - "Phobos", - true, - new Color(0x220D05), - new Color(0x7a5706), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f); - if (Loader.isModLoaded(MOD_ID_DC)) - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.PhobosStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - beeSpecies.setNocturnal(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(MARS, MOON, 20); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "phobosblocks"), 2); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(38, "Phobos")); // Phobos Dim - }), - DEIMOS( - GT_BranchDefinition.PLANET, - "Deimos", - true, - new Color(0x220D05), - new Color(0x7a3206), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.DeimosStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(HOT); - beeSpecies.setNocturnal(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(MARS, SPACE, 20); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "deimosblocks"), 1); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(40, "Deimos")); // Deimos Dim - }), - CERES( - GT_BranchDefinition.PLANET, - "Ceres", - true, - new Color(0x3ca5b7), - new Color(0x1e7267), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CeresStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - beeSpecies.setNocturnal(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(MARS, METEORICIRON, 20); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "ceresblocks"), 1); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(42, "Ceres")); // Ceres Dim - }), - JUPITER( - GT_BranchDefinition.PLANET, - "Jupiter", - false, - new Color(0x734B2E), - new Color(0xD0CBC4), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoIceDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.IoStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaIceDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.GanymedeStoneDust", 1, 0), 0.05f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(MARS, DESH, 15); - if (Loader.isModLoaded(MOD_ID_DC)) - tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Ledox"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(30, "Asteriods")); // Asteriods Dim - }), - IO( - GT_BranchDefinition.PLANET, - "IO", - true, - new Color(0x734B2E), - new Color(0xe5701b), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.IoStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, getSpecies(EXTRABEES, "volcanic"), 15); - tMutation.restrictTemperature(HELLISH); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "ioblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim - }), - EUROPA( - GT_BranchDefinition.PLANET, - "Europa", - true, - new Color(0x5982ea), - new Color(0x0b36a3), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaIceDust", 1, 0), 0.10f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, IRON, 15); - tMutation.restrictTemperature(ICY); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "europagrunt"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim - }), - GANYMEDE( - GT_BranchDefinition.PLANET, - "Ganymede", - true, - new Color(0x3d1b10), - new Color(0x190c07), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.GanymedeStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(COLD); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, TITANIUM, 15); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "ganymedeblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(43, "Ganymede")); // Ganymede Dim - }), - CALLISTO( - GT_BranchDefinition.PLANET, - "Callisto", - true, - new Color(0x0f333d), - new Color(0x0d84a5), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoIceDust", 1, 0), 0.10f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, getSpecies(EXTRABEES, "artic"), 15); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "callistoblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto Dim - }), - SATURN( - GT_BranchDefinition.PLANET, - "Saturn", - false, - new Color(0xD2A472), - new Color(0xF8C37B), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TitanStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusIceDust", 1, 0), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, LEDOX, 25, 2); - if (Loader.isModLoaded(MOD_ID_DC)) - tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Quantinum"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(30, "Asteriods")); // Asteriods Dim - }), - ENCELADUS( - GT_BranchDefinition.PLANET, - "Enceladus", - true, - new Color(0xD2A472), - new Color(0x193fa0), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusIceDust", 1, 0), 0.10f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(SATURN, CHROME, 25, 2); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "enceladusblocks"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim - }), - TITAN( - GT_BranchDefinition.PLANET, - "Titan", - true, - new Color(0xa0641b), - new Color(0x7c1024), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TitanStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(SATURN, NICKEL, 25, 2); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "titanblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(44, "Titan")); // Titan Dim - }), - URANUS( - GT_BranchDefinition.PLANET, - "Uranus", - false, - new Color(0x75C0C9), - new Color(0x84D8EC), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MirandaStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.OberonStoneDust", 1, 0), 0.05f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(SATURN, TRINIUM, 10); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "metalsblock"), 6); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim - }), - MIRANDA( - GT_BranchDefinition.PLANET, - "Miranda", - true, - new Color(0x75C0C9), - new Color(0x0d211c), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MirandaStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(URANUS, TIN, 10); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "mirandablocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(86, "Miranda")); // Miranda Dim - }), - OBERON( - GT_BranchDefinition.PLANET, - "Oberon", - true, - new Color(0x4A4033), - new Color(0xB5A288), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.OberonStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(ICY); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(URANUS, IRIDIUM, 10); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "oberonblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim - }), - NEPTUNE( - GT_BranchDefinition.PLANET, - "Neptune", - false, - new Color(0x334CFF), - new Color(0x576DFF), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.ProteusStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TritonStoneDust", 1, 0), 0.05f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(COLD); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(URANUS, ORIHARUKON, 7); - if (Loader.isModLoaded(MOD_ID_DC)) - tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.MysteriousCrystal"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim - }), - PROTEUS( - GT_BranchDefinition.PLANET, - "Proteus", - true, - new Color(0x334CFF), - new Color(0x592610), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.ProteusStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(COLD); - beeSpecies.setNocturnal(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, COPPER, 7); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "proteusblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(47, "Proteus")); // Proteus Dim - }), - TRITON( - GT_BranchDefinition.PLANET, - "Triton", - true, - new Color(0x334CFF), - new Color(0x421118), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TritonStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, GOLD, 7); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "tritonblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(48, "Triton")); // Triton Dim - }), - PLUTO( - GT_BranchDefinition.PLANET, - "Pluto", - false, - new Color(0x34271E), - new Color(0x69503D), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLUTO), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.PlutoStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.PlutoIceDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, PLUTONIUM, 5); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "plutoblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim - }), - HAUMEA( - GT_BranchDefinition.PLANET, - "Haumea", - false, - new Color(0x1C1413), - new Color(0x392B28), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HAUMEA), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.HaumeaStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(ICY); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, NAQUADAH, 7, 2); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "haumeablocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(83, "Haumea")); // Haumea Dim - }), - MAKEMAKE( - GT_BranchDefinition.PLANET, - "MakeMake", - false, - new Color(0x301811), - new Color(0x120A07), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MAKEMAKE), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MakeMakeStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, NAQUADRIA, 7, 2); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "makemakegrunt"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(25, "MakeMake")); // MakeMake Dim - }), - CENTAURI( - GT_BranchDefinition.PLANET, - "Centauri", - false, - new Color(0x2F2A14), - new Color(0xB06B32), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CentauriASurfaceDust", 1, 0), 0.05f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, DESH, 3); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "acentauribbgrunt"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim - }), - ACENTAURI( - GT_BranchDefinition.PLANET, - "aCentauri", - false, - new Color(0x2F2A14), - new Color(0xa01e14), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CentauriASurfaceDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - new Consumer<GT_BeeDefinition>() { - @Override - public void accept(GT_BeeDefinition dis) { - IBeeMutationCustom tMutation = dis.registerMutation(CENTAURI, INFINITYCATALYST, 3); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "acentauribbgrunt"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(31, "aCentauri")); // aCentauri Dim - } - }), - TCETI( - GT_BranchDefinition.PLANET, - "tCeti", - false, - new Color(0x46241A), - new Color(0x7B412F), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TCetiEStoneDust", 1, 0), 0.05f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, HAUMEA, 5, 2); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "tcetieblocks"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim - }), - TCETIE( - GT_BranchDefinition.PLANET, - "tCetiE", - false, - new Color(0x2d561b), - new Color(0x0c0f60), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TCetiEStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(TCETI, getSpecies(MAGICBEES, "TCWater"), 5, 2); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "tcetieblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim - }), + MOON(GT_BranchDefinition.PLANET, "Moon", false, new Color(0x373735), new Color(0x7E7E78), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MOON), 0.35f); + if (Loader.isModLoaded(MOD_ID_DC)) + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MoonStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(SPACE, CLAY, 25); + if (Loader.isModLoaded("GalacticraftCore")) + tMutation.requireResource(GameRegistry.findBlock("GalacticraftCore", "tile.moonBlock"), 4); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28, "Moon")); // Moon Dim + }), + MARS(GT_BranchDefinition.PLANET, "Mars", false, new Color(0x220D05), new Color(0x3A1505), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MarsStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(MOON, IRON, 20); + if (Loader.isModLoaded("GalacticraftMars")) + tMutation.requireResource(GameRegistry.findBlock("GalacticraftMars", "tile.mars"), 5); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim + }), + PHOBOS(GT_BranchDefinition.PLANET, "Phobos", true, new Color(0x220D05), new Color(0x7a5706), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f); + if (Loader.isModLoaded(MOD_ID_DC)) + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.PhobosStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + beeSpecies.setNocturnal(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(MARS, MOON, 20); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "phobosblocks"), 2); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(38, "Phobos")); // Phobos Dim + }), + DEIMOS(GT_BranchDefinition.PLANET, "Deimos", true, new Color(0x220D05), new Color(0x7a3206), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.DeimosStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(HOT); + beeSpecies.setNocturnal(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(MARS, SPACE, 20); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "deimosblocks"), 1); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(40, "Deimos")); // Deimos Dim + }), + CERES(GT_BranchDefinition.PLANET, "Ceres", true, new Color(0x3ca5b7), new Color(0x1e7267), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CeresStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + beeSpecies.setNocturnal(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(MARS, METEORICIRON, 20); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "ceresblocks"), 1); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(42, "Ceres")); // Ceres Dim + }), + JUPITER(GT_BranchDefinition.PLANET, "Jupiter", false, new Color(0x734B2E), new Color(0xD0CBC4), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.IoStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.GanymedeStoneDust", 1, 0), 0.05f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(MARS, DESH, 15); + if (Loader.isModLoaded(MOD_ID_DC)) + tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Ledox"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteriods")); // Asteriods Dim + }), + IO(GT_BranchDefinition.PLANET, "IO", true, new Color(0x734B2E), new Color(0xe5701b), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.IoStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, getSpecies(EXTRABEES, "volcanic"), 15); + tMutation.restrictTemperature(HELLISH); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "ioblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim + }), + EUROPA(GT_BranchDefinition.PLANET, "Europa", true, new Color(0x5982ea), new Color(0x0b36a3), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaIceDust", 1, 0), 0.10f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, IRON, 15); + tMutation.restrictTemperature(ICY); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "europagrunt"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim + }), + GANYMEDE(GT_BranchDefinition.PLANET, "Ganymede", true, new Color(0x3d1b10), new Color(0x190c07), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.GanymedeStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(COLD); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, TITANIUM, 15); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "ganymedeblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(43, "Ganymede")); // Ganymede Dim + }), + CALLISTO(GT_BranchDefinition.PLANET, "Callisto", true, new Color(0x0f333d), new Color(0x0d84a5), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoIceDust", 1, 0), 0.10f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, getSpecies(EXTRABEES, "artic"), 15); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "callistoblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto Dim + }), + SATURN(GT_BranchDefinition.PLANET, "Saturn", false, new Color(0xD2A472), new Color(0xF8C37B), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TitanStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusIceDust", 1, 0), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, LEDOX, 25, 2); + if (Loader.isModLoaded(MOD_ID_DC)) + tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Quantinum"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteriods")); // Asteriods Dim + }), + ENCELADUS(GT_BranchDefinition.PLANET, "Enceladus", true, new Color(0xD2A472), new Color(0x193fa0), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusIceDust", 1, 0), 0.10f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(SATURN, CHROME, 25, 2); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "enceladusblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim + }), + TITAN(GT_BranchDefinition.PLANET, "Titan", true, new Color(0xa0641b), new Color(0x7c1024), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TitanStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(SATURN, NICKEL, 25, 2); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "titanblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(44, "Titan")); // Titan Dim + }), + URANUS(GT_BranchDefinition.PLANET, "Uranus", false, new Color(0x75C0C9), new Color(0x84D8EC), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MirandaStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.OberonStoneDust", 1, 0), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(SATURN, TRINIUM, 10); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "metalsblock"), 6); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim + }), + MIRANDA(GT_BranchDefinition.PLANET, "Miranda", true, new Color(0x75C0C9), new Color(0x0d211c), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MirandaStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(URANUS, TIN, 10); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "mirandablocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(86, "Miranda")); // Miranda Dim + }), + OBERON(GT_BranchDefinition.PLANET, "Oberon", true, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.OberonStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(ICY); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(URANUS, IRIDIUM, 10); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "oberonblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim + }), + NEPTUNE(GT_BranchDefinition.PLANET, "Neptune", false, new Color(0x334CFF), new Color(0x576DFF), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.ProteusStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TritonStoneDust", 1, 0), 0.05f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(COLD); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(URANUS, ORIHARUKON, 7); + if (Loader.isModLoaded(MOD_ID_DC)) + tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.MysteriousCrystal"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim + }), + PROTEUS(GT_BranchDefinition.PLANET, "Proteus", true, new Color(0x334CFF), new Color(0x592610), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.ProteusStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(COLD); + beeSpecies.setNocturnal(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, COPPER, 7); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "proteusblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(47, "Proteus")); // Proteus Dim + }), + TRITON(GT_BranchDefinition.PLANET, "Triton", true, new Color(0x334CFF), new Color(0x421118), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TritonStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, GOLD, 7); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "tritonblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(48, "Triton")); // Triton Dim + }), + PLUTO(GT_BranchDefinition.PLANET, "Pluto", false, new Color(0x34271E), new Color(0x69503D), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLUTO), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.PlutoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.PlutoIceDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, PLUTONIUM, 5); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "plutoblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim + }), + HAUMEA(GT_BranchDefinition.PLANET, "Haumea", false, new Color(0x1C1413), new Color(0x392B28), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HAUMEA), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.HaumeaStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(ICY); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, NAQUADAH, 7, 2); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "haumeablocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(83, "Haumea")); // Haumea Dim + }), + MAKEMAKE(GT_BranchDefinition.PLANET, "MakeMake", false, new Color(0x301811), new Color(0x120A07), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MAKEMAKE), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MakeMakeStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, NAQUADRIA, 7, 2); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "makemakegrunt"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(25, "MakeMake")); // MakeMake Dim + }), + CENTAURI(GT_BranchDefinition.PLANET, "Centauri", false, new Color(0x2F2A14), new Color(0xB06B32), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CentauriASurfaceDust", 1, 0), 0.05f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, DESH, 3); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "acentauribbgrunt"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim + }), + ACENTAURI(GT_BranchDefinition.PLANET, "aCentauri", false, new Color(0x2F2A14), new Color(0xa01e14), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CentauriASurfaceDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), new Consumer<GT_BeeDefinition>() { + + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(CENTAURI, INFINITYCATALYST, 3); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "acentauribbgrunt"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(31, "aCentauri")); // aCentauri Dim + } + }), + TCETI(GT_BranchDefinition.PLANET, "tCeti", false, new Color(0x46241A), new Color(0x7B412F), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TCetiEStoneDust", 1, 0), 0.05f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, HAUMEA, 5, 2); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "tcetieblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim + }), + TCETIE(GT_BranchDefinition.PLANET, "tCetiE", false, new Color(0x2d561b), new Color(0x0c0f60), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TCetiEStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(TCETI, getSpecies(MAGICBEES, "TCWater"), 5, 2); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "tcetieblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim + }), // Parents: TCETI and TCETIE, 25% combchance, needs Damp Humidity and Normal temperature. Is Mycophilic - SEAWEED( - GT_BranchDefinition.PLANET, - "SeaWeed", - true, - new Color(0xCBCBCB), - new Color(0x83FF83), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SEAWEED), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TCetiEStoneDust", 1, 0), 0.15f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_1); - AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.DOWN_1); - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectMycophilic); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(TCETI, TCETIE, 5, 2); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "tcetieblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim - }), + SEAWEED(GT_BranchDefinition.PLANET, "SeaWeed", true, new Color(0xCBCBCB), new Color(0x83FF83), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SEAWEED), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TCetiEStoneDust", 1, 0), 0.15f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_1); + AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.DOWN_1); + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectMycophilic); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(TCETI, TCETIE, 5, 2); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "tcetieblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim + }), - BARNARDA( - GT_BranchDefinition.PLANET, - "Barnarda", - false, - new Color(0x0D5A0D), - new Color(0xE6C18D), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaEStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaFStoneDust", 1, 0), 0.05f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, THORIUM, 3, 2); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "barnardaEgrunt"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim - }), - BARNARDAC( - GT_BranchDefinition.PLANET, - "BarnardaC", - false, - new Color(0x0D5A0D), - new Color(0x473f0a), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, AMERICIUM, 3, 2); - if (Loader.isModLoaded("GalaxySpace")) { - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "barnardaEgrunt"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(32, "Barnarda C")); // Barnarda C Dim - } - }), - BARNARDAE( - GT_BranchDefinition.PLANET, - "BarnardaE", - false, - new Color(0x0D5A0D), - new Color(0x4c1f0a), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaEStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, DIVIDED, 3, 2); - if (Loader.isModLoaded("GalaxySpace")) { - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "barnardaEgrunt"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(81, "Barnard E")); // "Barnard E Dim - } - }), - BARNARDAF( - GT_BranchDefinition.PLANET, - "BarnardaF", - false, - new Color(0x0D5A0D), - new Color(0x1e0b49), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaFStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HOT); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, NEUTRONIUM, 3, 2); - if (Loader.isModLoaded("GalaxySpace")) { - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "barnardaFgrunt"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(82, "Barnard F")); // "Barnard F Dim - } - }), - VEGA( - GT_BranchDefinition.PLANET, - "Vega", - false, - new Color(0x1A2036), - new Color(0xB5C0DE), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.VegaBStoneDust", 1, 0), 0.05f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(COLD); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, NAQUADAH, 2); - if (Loader.isModLoaded("GalaxySpace")) { - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "vegabgrunt"), 0); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim - } - }), - VEGAB( - GT_BranchDefinition.PLANET, - "VegaB", - false, - new Color(0x1A2036), - new Color(0x81e261), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f); - if (Loader.isModLoaded(MOD_ID_DC)) - beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.VegaBStoneDust", 1, 0), 0.10f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(COLD); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(VEGA, NAQUADRIA, 2); - if (Loader.isModLoaded("GalaxySpace")) { - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "vegabgrunt"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(84, "VegaB")); // VegaB Dim - } - }), - MERCURY( - GT_BranchDefinition.PLANET, - "Mercury", - false, - new Color(0x4A4033), - new Color(0xB5A288), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MERCURY), 0.35f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, TUNGSTEN, 25, 2); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "mercuryblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(37, "Mercury")); // Mercury Dim - }), - VENUS( - GT_BranchDefinition.PLANET, - "Venus", - false, - new Color(0x4A4033), - new Color(0xB5A288), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VENUS), 0.35f); - beeSpecies.setHumidity(ARID); - beeSpecies.setTemperature(HELLISH); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, MITHRIL, 25, 2); - if (Loader.isModLoaded("GalaxySpace")) - tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "venusblocks"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim - }), + BARNARDA(GT_BranchDefinition.PLANET, "Barnarda", false, new Color(0x0D5A0D), new Color(0xE6C18D), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaEStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaFStoneDust", 1, 0), 0.05f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, THORIUM, 3, 2); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "barnardaEgrunt"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim + }), + BARNARDAC(GT_BranchDefinition.PLANET, "BarnardaC", false, new Color(0x0D5A0D), new Color(0x473f0a), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, AMERICIUM, 3, 2); + if (Loader.isModLoaded("GalaxySpace")) { + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "barnardaEgrunt"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(32, "Barnarda C")); // Barnarda C Dim + } + }), + BARNARDAE(GT_BranchDefinition.PLANET, "BarnardaE", false, new Color(0x0D5A0D), new Color(0x4c1f0a), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaEStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, DIVIDED, 3, 2); + if (Loader.isModLoaded("GalaxySpace")) { + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "barnardaEgrunt"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(81, "Barnard E")); // "Barnard E Dim + } + }), + BARNARDAF(GT_BranchDefinition.PLANET, "BarnardaF", false, new Color(0x0D5A0D), new Color(0x1e0b49), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaFStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HOT); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, NEUTRONIUM, 3, 2); + if (Loader.isModLoaded("GalaxySpace")) { + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "barnardaFgrunt"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(82, "Barnard F")); // "Barnard F Dim + } + }), + VEGA(GT_BranchDefinition.PLANET, "Vega", false, new Color(0x1A2036), new Color(0xB5C0DE), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.VegaBStoneDust", 1, 0), 0.05f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(COLD); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, NAQUADAH, 2); + if (Loader.isModLoaded("GalaxySpace")) { + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "vegabgrunt"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt + // Dim + } + }), + VEGAB(GT_BranchDefinition.PLANET, "VegaB", false, new Color(0x1A2036), new Color(0x81e261), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f); + if (Loader.isModLoaded(MOD_ID_DC)) + beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.VegaBStoneDust", 1, 0), 0.10f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(COLD); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(VEGA, NAQUADRIA, 2); + if (Loader.isModLoaded("GalaxySpace")) { + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "vegabgrunt"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(84, "VegaB")); // VegaB Dim + } + }), + MERCURY(GT_BranchDefinition.PLANET, "Mercury", false, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MERCURY), 0.35f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, TUNGSTEN, 25, 2); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "mercuryblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(37, "Mercury")); // Mercury Dim + }), + VENUS(GT_BranchDefinition.PLANET, "Venus", false, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VENUS), 0.35f); + beeSpecies.setHumidity(ARID); + beeSpecies.setTemperature(HELLISH); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, MITHRIL, 25, 2); + if (Loader.isModLoaded("GalaxySpace")) + tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "venusblocks"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim + }), // Infinity Line - COSMICNEUTRONIUM( - GT_BranchDefinition.PLANET, - "CosmicNeutronium", - false, - new Color(0x484848), - new Color(0x323232), + COSMICNEUTRONIUM(GT_BranchDefinition.PLANET, "CosmicNeutronium", false, new Color(0x484848), new Color(0x323232), beeSpecies -> { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COSMICNEUTRONIUM), 0.375f); beeSpecies.setHumidity(DAMP); @@ -3403,19 +2211,12 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NEUTRONIUM, BARNARDAF, 7, 10); if (Loader.isModLoaded("Avaritia")) tMutation.requireResource(GameRegistry.findBlock("Avaritia", "Resource_Block"), 0); }), - INFINITYCATALYST( - GT_BranchDefinition.PLANET, - "InfinityCatalyst", - false, - new Color(0xFFFFFF), - new Color(0xFFFFFF), + INFINITYCATALYST(GT_BranchDefinition.PLANET, "InfinityCatalyst", false, new Color(0xFFFFFF), new Color(0xFFFFFF), beeSpecies -> { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.INFINITYCATALYST), 0.015f); beeSpecies.setHumidity(DAMP); @@ -3424,422 +2225,257 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance); - }, - template -> { + }, template -> { AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "blindness")); - }, - dis -> { - IMutationCustom tMutation = - dis.registerMutation(DOB, COSMICNEUTRONIUM, 3, 10).setIsSecret(); + }, dis -> { + IMutationCustom tMutation = dis.registerMutation(DOB, COSMICNEUTRONIUM, 3, 10).setIsSecret(); if (Loader.isModLoaded("Avaritia")) tMutation.requireResource(GameRegistry.findBlock("Avaritia", "Resource_Block"), 1); }), - INFINITY( - GT_BranchDefinition.PLANET, - "Infinity", - false, - new Color(0xFFFFFF), - new Color(0xFFFFFF), - beeSpecies -> { - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.INFINITY), 0.015f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB - beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, COSMICNEUTRONIUM, 1, 10); - if (Loader.isModLoaded("avaritiaddons")) - tMutation.requireResource(GameRegistry.findBlock("avaritiaddons", "InfinityChest"), 0); - }), - KEVLAR( - GT_BranchDefinition.IC2, - "kevlar", - false, - new Color(0x2d542f), - new Color(0xa2baa3), - beeSpecies -> { - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.KEVLAR), 0.075f); - beeSpecies.addSpecialty(MaterialsKevlar.Kevlar.getNuggets(1), 0.01f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setTemperature(COLD); - beeSpecies.setHasEffect(); - beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance); - }, - template -> { - AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); - AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); - AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectSnowing); - AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); - AlleleHelper.instance.set(template, NOCTURNAL, true); - AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); - AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); - }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(OIL, INFINITY, 4); - tMutation.requireResource("frameGtKevlar"); - }), + INFINITY(GT_BranchDefinition.PLANET, "Infinity", false, new Color(0xFFFFFF), new Color(0xFFFFFF), beeSpecies -> { + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.INFINITY), 0.015f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB + beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, COSMICNEUTRONIUM, 1, 10); + if (Loader.isModLoaded("avaritiaddons")) + tMutation.requireResource(GameRegistry.findBlock("avaritiaddons", "InfinityChest"), 0); + }), + KEVLAR(GT_BranchDefinition.IC2, "kevlar", false, new Color(0x2d542f), new Color(0xa2baa3), beeSpecies -> { + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.KEVLAR), 0.075f); + beeSpecies.addSpecialty(MaterialsKevlar.Kevlar.getNuggets(1), 0.01f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(COLD); + beeSpecies.setHasEffect(); + beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance); + }, template -> { + AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); + AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); + AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectSnowing); + AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); + AlleleHelper.instance.set(template, NOCTURNAL, true); + AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); + AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); + }, dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(OIL, INFINITY, 4); + tMutation.requireResource("frameGtKevlar"); + }), // Noble Gas Line // Helium bee, Humidity: normal, Temperature: Icy, Parents: Space & Mars, Mutationrate: 10%, Combrate: 50% - HELIUM( - GT_BranchDefinition.NOBLEGAS, - "Helium", - false, - new Color(0xFFA9FF), - new Color(0xC8B8B4), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HELIUM), 0.35f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "Watery"), ENDDUST, 10); - tMutation.restrictTemperature(ICY); - // if (Loader.isModLoaded("TwilightForest")) - // tMutation.requireResource(GameRegistry.findBlock("TwilightForest", "Aurora Block"), 0); - }), + HELIUM(GT_BranchDefinition.NOBLEGAS, "Helium", false, new Color(0xFFA9FF), new Color(0xC8B8B4), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HELIUM), 0.35f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "Watery"), ENDDUST, 10); + tMutation.restrictTemperature(ICY); + // if (Loader.isModLoaded("TwilightForest")) + // tMutation.requireResource(GameRegistry.findBlock("TwilightForest", "Aurora Block"), 0); + }), // Argon bee, Humidity: normal, Temperature: Icy, Parents: Helium & Phobos, Mutationrate: 8%, Combrate: 50% - ARGON( - GT_BranchDefinition.NOBLEGAS, - "Argon", - false, - new Color(0x89D9E1), - new Color(0xBDA5C2), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ARGON), 0.35f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(HELIUM, LICH, 8); - tMutation.restrictTemperature(ICY); - }), + ARGON(GT_BranchDefinition.NOBLEGAS, "Argon", false, new Color(0x89D9E1), new Color(0xBDA5C2), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ARGON), 0.35f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(HELIUM, LICH, 8); + tMutation.restrictTemperature(ICY); + }), // Neon bee, Humidity: normal, Temperature: Icy, Parents: Xenon & Ceres, Mutationrate: 6%, Combrate: 50% - NEON( - GT_BranchDefinition.NOBLEGAS, - "Neon", - false, - new Color(0xFFC826), - new Color(0xFF7200), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEON), 0.35f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(ARGON, HYDRA, 6); - tMutation.restrictTemperature(ICY); - }), + NEON(GT_BranchDefinition.NOBLEGAS, "Neon", false, new Color(0xFFC826), new Color(0xFF7200), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEON), 0.35f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(ARGON, HYDRA, 6); + tMutation.restrictTemperature(ICY); + }), // Krypton bee, Humidity: normal, Temperature: Icy, Parents: Neon & Jupiter, Mutationrate: 4%, Combrate: 50% - KRYPTON( - GT_BranchDefinition.NOBLEGAS, - "Krypton", - false, - new Color(0x8A97B0), - new Color(0x160822), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.KRYPTON), 0.35f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(NEON, URGHAST, 4); - tMutation.restrictTemperature(ICY); - }), + KRYPTON(GT_BranchDefinition.NOBLEGAS, "Krypton", false, new Color(0x8A97B0), new Color(0x160822), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.KRYPTON), 0.35f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(NEON, URGHAST, 4); + tMutation.restrictTemperature(ICY); + }), // Xenon bee, Humidity: normal, Temperature: Icy, Parents: Argon & Deimos, Mutationrate: 6%, Combrate: 50% - XENON( - GT_BranchDefinition.NOBLEGAS, - "Xenon", - false, - new Color(0x8A97B0), - new Color(0x160822), - beeSpecies -> { - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.XENON), 0.525f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB - beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(KRYPTON, SNOWQUEEN, 2); - tMutation.restrictTemperature(ICY); - }), + XENON(GT_BranchDefinition.NOBLEGAS, "Xenon", false, new Color(0x8A97B0), new Color(0x160822), beeSpecies -> { + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.XENON), 0.525f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB + beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(KRYPTON, SNOWQUEEN, 2); + tMutation.restrictTemperature(ICY); + }), // Oxygen bee, Humidity: normal, Temperature: Icy, Parents: Space & Callisto, Mutationrate: 15%, Combrate: 50% - OXYGEN( - GT_BranchDefinition.NOBLEGAS, - "Oxygen", - false, - new Color(0xFFFFFF), - new Color(0x8F8FFF), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.OXYGEN), 0.35f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(HELIUM, DRAGONESSENCE, 15); - tMutation.restrictTemperature(ICY); - }), + OXYGEN(GT_BranchDefinition.NOBLEGAS, "Oxygen", false, new Color(0xFFFFFF), new Color(0x8F8FFF), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.OXYGEN), 0.35f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(HELIUM, DRAGONESSENCE, 15); + tMutation.restrictTemperature(ICY); + }), // Hydrogen bee, Humidity: normal, Temperature: Icy, Parents: Oxygen & Watery, Mutationrate: 15%, Combrate: 50% - HYDROGEN( - GT_BranchDefinition.NOBLEGAS, - "Oxygen", - false, - new Color(0xFFFFFF), - new Color(0xFF1493), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HYDROGEN), 0.35f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(OXYGEN, getSpecies(MAGICBEES, "Watery"), 15); - tMutation.restrictTemperature(ICY); - }), + HYDROGEN(GT_BranchDefinition.NOBLEGAS, "Oxygen", false, new Color(0xFFFFFF), new Color(0xFF1493), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HYDROGEN), 0.35f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(OXYGEN, getSpecies(MAGICBEES, "Watery"), 15); + tMutation.restrictTemperature(ICY); + }), // Nitrogen bee, Humidity: normal, Temperature: Icy, Parents: Oxygen & Hydrogen, Mutationrate: 15%, Combrate: 50% - NITROGEN( - GT_BranchDefinition.NOBLEGAS, - "Nitrogen", - false, - new Color(0xFFC832), - new Color(0xA52A2A), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NITROGEN), 0.35f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(OXYGEN, HYDROGEN, 15); - tMutation.restrictTemperature(ICY); - }), + NITROGEN(GT_BranchDefinition.NOBLEGAS, "Nitrogen", false, new Color(0xFFC832), new Color(0xA52A2A), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NITROGEN), 0.35f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(OXYGEN, HYDROGEN, 15); + tMutation.restrictTemperature(ICY); + }), // Fluorine bee, Humidity: normal, Temperature: Icy, Parents: Nitrogen & Hydrogen, Mutationrate: 15%, Combrate: 50% - FLUORINE( - GT_BranchDefinition.NOBLEGAS, - "Fluorine", - false, - new Color(0x86AFF0), - new Color(0xFF6D00), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.FLUORINE), 0.35f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setTemperature(ICY); - beeSpecies.setNocturnal(); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(NITROGEN, HYDROGEN, 15); - tMutation.restrictTemperature(ICY); - }), + FLUORINE(GT_BranchDefinition.NOBLEGAS, "Fluorine", false, new Color(0x86AFF0), new Color(0xFF6D00), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.FLUORINE), 0.35f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(NITROGEN, HYDROGEN, 15); + tMutation.restrictTemperature(ICY); + }), // infused Shards line - AIR( - GT_BranchDefinition.INFUSEDSHARD, - "Air", - false, - new Color(0xFFFF7E), - new Color(0x60602F), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDAER), 0.30f); - beeSpecies.setHumidity(DAMP); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = - dis.registerMutation(getSpecies(MAGICBEES, "Supernatural"), getSpecies(MAGICBEES, "Windy"), 15); - tMutation.restrictTemperature(HOT); - if (Loader.isModLoaded("Thaumcraft")) - tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 0); - }), - FIRE( - GT_BranchDefinition.INFUSEDSHARD, - "Fire", - false, - new Color(0xED3801), - new Color(0x3B0E00), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDIGNIS), 0.30f); - beeSpecies.setHumidity(ARID); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "Supernatural"), AIR, 15); - tMutation.restrictTemperature(HELLISH); - if (Loader.isModLoaded("Thaumcraft")) - tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 1); - }), - WATER( - GT_BranchDefinition.INFUSEDSHARD, - "Water", - false, - new Color(0x0090FF), - new Color(0x002542), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDAQUA), 0.30f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(FIRE, AIR, 15); - tMutation.restrictTemperature(ICY); - if (Loader.isModLoaded("Thaumcraft")) - tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 2); - }), - EARTH( - GT_BranchDefinition.INFUSEDSHARD, - "Earth", - false, - new Color(0x008600), - new Color(0x003300), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDTERRA), 0.30f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(WATER, FIRE, 15); - tMutation.restrictTemperature(WARM); - if (Loader.isModLoaded("Thaumcraft")) - tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 3); - }), - ORDER( - GT_BranchDefinition.INFUSEDSHARD, - "Order", - false, - new Color(0x8A97B0), - new Color(0x5C5F62), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDORDO), 0.30f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(EARTH, FIRE, 15); - tMutation.restrictTemperature(ICY); - if (Loader.isModLoaded("Thaumcraft")) - tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 4); - }), - CHAOS( - GT_BranchDefinition.INFUSEDSHARD, - "Chaos", - false, - new Color(0x2E2E41), - new Color(0x232129), - beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDPERDITIO), 0.30f); - beeSpecies.setHumidity(EnumHumidity.NORMAL); - beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(ORDER, FIRE, 15); - tMutation.restrictTemperature(ICY); - if (Loader.isModLoaded("Thaumcraft")) - tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 5); - }), - NETHERSHARD( - GT_BranchDefinition.INFUSEDSHARD, - "Nethershard", - false, - new Color(0xBE0135), - new Color(0x350211), + AIR(GT_BranchDefinition.INFUSEDSHARD, "Air", false, new Color(0xFFFF7E), new Color(0x60602F), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDAER), 0.30f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis + .registerMutation(getSpecies(MAGICBEES, "Supernatural"), getSpecies(MAGICBEES, "Windy"), 15); + tMutation.restrictTemperature(HOT); + if (Loader.isModLoaded("Thaumcraft")) + tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 0); + }), + FIRE(GT_BranchDefinition.INFUSEDSHARD, "Fire", false, new Color(0xED3801), new Color(0x3B0E00), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDIGNIS), 0.30f); + beeSpecies.setHumidity(ARID); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "Supernatural"), AIR, 15); + tMutation.restrictTemperature(HELLISH); + if (Loader.isModLoaded("Thaumcraft")) + tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 1); + }), + WATER(GT_BranchDefinition.INFUSEDSHARD, "Water", false, new Color(0x0090FF), new Color(0x002542), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDAQUA), 0.30f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(FIRE, AIR, 15); + tMutation.restrictTemperature(ICY); + if (Loader.isModLoaded("Thaumcraft")) + tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 2); + }), + EARTH(GT_BranchDefinition.INFUSEDSHARD, "Earth", false, new Color(0x008600), new Color(0x003300), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDTERRA), 0.30f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(WATER, FIRE, 15); + tMutation.restrictTemperature(WARM); + if (Loader.isModLoaded("Thaumcraft")) + tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 3); + }), + ORDER(GT_BranchDefinition.INFUSEDSHARD, "Order", false, new Color(0x8A97B0), new Color(0x5C5F62), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDORDO), 0.30f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(EARTH, FIRE, 15); + tMutation.restrictTemperature(ICY); + if (Loader.isModLoaded("Thaumcraft")) + tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 4); + }), + CHAOS(GT_BranchDefinition.INFUSEDSHARD, "Chaos", false, new Color(0x2E2E41), new Color(0x232129), beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDPERDITIO), 0.30f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setHasEffect(); + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(ORDER, FIRE, 15); + tMutation.restrictTemperature(ICY); + if (Loader.isModLoaded("Thaumcraft")) + tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCrystal"), 5); + }), + NETHERSHARD(GT_BranchDefinition.INFUSEDSHARD, "Nethershard", false, new Color(0xBE0135), new Color(0x350211), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NETHERSHARD), 0.30f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(CHAOS, FIRE, 15); tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockgem3"), 3); }), - ENDSHARD( - GT_BranchDefinition.INFUSEDSHARD, - "Endshard", - false, - new Color(0x2E2E41), - new Color(0x232129), + ENDSHARD(GT_BranchDefinition.INFUSEDSHARD, "Endshard", false, new Color(0x2E2E41), new Color(0x232129), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ENDSHARD), 0.30f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NETHERSHARD, ENDDUST, 15); tMutation.restrictTemperature(ICY); tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockgem1"), 7); }), // Organic branch 2.0 - UNKNOWNWATER( - GT_BranchDefinition.ORGANIC, - "UnknownWater", - false, - new Color(0x4333A5), - new Color(0x36ABFF), + UNKNOWNWATER(GT_BranchDefinition.ORGANIC, "UnknownWater", false, new Color(0x4333A5), new Color(0x36ABFF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.UNKNOWNWATER), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> dis.registerMutation(INFINITYCATALYST, MYSTERIOUSCRYSTAL, 5)), // Endgame bees - JAEGERMEISTER( - GT_BranchDefinition.ENDGAME, - "JaegerMeister", - false, - new Color(0x05AD18), - new Color(0xE7DAC3), + JAEGERMEISTER(GT_BranchDefinition.ENDGAME, "JaegerMeister", false, new Color(0x05AD18), new Color(0xE7DAC3), beeSpecies -> { beeSpecies.addProduct(GT_ModHandler.getModItem("berriespp", "BppPotions", 1L, 8), 0.01f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, - template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, NAQUADRIA, 5); tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockmachines"), 4684); - tMutation.addMutationCondition( - new GT_Bees.DimensionMutationCondition(100, "Deep Dark")); // Deep Dark dim + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(100, "Deep Dark")); // Deep Dark + // dim }); + private final GT_BranchDefinition branch; private final GT_AlleleBeeSpecies species; private final Consumer<GT_AlleleBeeSpecies> mSpeciesProperties; @@ -3848,14 +2484,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { private IAllele[] template; private IBeeGenome genome; - GT_BeeDefinition( - GT_BranchDefinition branch, - String binomial, - boolean dominant, - Color primary, - Color secondary, - Consumer<GT_AlleleBeeSpecies> aSpeciesProperties, - Consumer<IAllele[]> aAlleles, + GT_BeeDefinition(GT_BranchDefinition branch, String binomial, boolean dominant, Color primary, Color secondary, + Consumer<GT_AlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles, Consumer<GT_BeeDefinition> aMutations) { this.mAlleles = aAlleles; this.mMutations = aMutations; @@ -3870,7 +2500,15 @@ public enum GT_BeeDefinition implements IBeeDefinition { this.branch = branch; this.species = new GT_AlleleBeeSpecies( - uid, dominant, name, "GTNH", description, branch.getBranch(), binomial, primary, secondary); + uid, + dominant, + name, + "GTNH", + description, + branch.getBranch(), + binomial, + primary, + secondary); } public static void initBees() { @@ -3994,26 +2632,27 @@ public enum GT_BeeDefinition implements IBeeDefinition { } /** - * Diese neue Funtion erlaubt Mutationsraten unter 1%. Setze dazu die Mutationsrate als Bruch mit chance / chanceDivider - * This new function allows Mutation percentages under 1%. Set them as a fraction with chance / chanceDivider + * Diese neue Funtion erlaubt Mutationsraten unter 1%. Setze dazu die Mutationsrate als Bruch mit chance / + * chanceDivider This new function allows Mutation percentages under 1%. Set them as a fraction with chance / + * chanceDivider */ - private IBeeMutationCustom registerMutation( - IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, float chanceDivider) { + private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, + float chanceDivider) { return new GT_Bee_Mutation(parent1, parent2, this.getTemplate(), chance, chanceDivider); } - private IBeeMutationCustom registerMutation( - GT_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance, float chanceDivider) { + private IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance, + float chanceDivider) { return registerMutation(parent1.species, parent2, chance, chanceDivider); } - private IBeeMutationCustom registerMutation( - IAlleleBeeSpecies parent1, GT_BeeDefinition parent2, int chance, float chanceDivider) { + private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GT_BeeDefinition parent2, int chance, + float chanceDivider) { return registerMutation(parent1, parent2.species, chance, chanceDivider); } - private IBeeMutationCustom registerMutation( - GT_BeeDefinition parent1, GT_BeeDefinition parent2, int chance, float chanceDivider) { + private IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, GT_BeeDefinition parent2, int chance, + float chanceDivider) { return registerMutation(parent1.species, parent2, chance, chanceDivider); } diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java index 386ac995a7..3b3849f588 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Bees.java +++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java @@ -2,6 +2,9 @@ package gregtech.loaders.misc; import static gregtech.api.enums.GT_Values.MOD_ID_FR; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + import cpw.mods.fml.common.Loader; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.core.IClimateProvider; @@ -14,8 +17,6 @@ import gregtech.common.items.ItemComb; import gregtech.common.items.ItemDrop; import gregtech.common.items.ItemPollen; import gregtech.common.items.ItemPropolis; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; public class GT_Bees { @@ -78,6 +79,7 @@ public class GT_Bees { } private static class AlleleFloat extends Allele implements IAlleleFloat { + private float value; public AlleleFloat(String id, float val, boolean isDominant) { @@ -114,7 +116,7 @@ public class GT_Bees { public AlleleArea(String id, int rangeXZ, int rangeY, boolean isDominant) { super("gregtech." + id, "gregtech." + id, isDominant); - this.value = new int[] {rangeXZ, rangeY, rangeXZ}; + this.value = new int[] { rangeXZ, rangeY, rangeXZ }; AlleleManager.alleleRegistry.registerAllele(this, EnumBeeChromosome.TERRITORY); } @@ -135,16 +137,8 @@ public class GT_Bees { } @Override - public float getChance( - World world, - int x, - int y, - int z, - IAllele allele0, - IAllele allele1, - IGenome genome0, - IGenome genome1, - IClimateProvider climate) { + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, + IGenome genome1, IClimateProvider climate) { if (world.provider.dimensionId == dimID) return 1; return 0; } @@ -166,16 +160,8 @@ public class GT_Bees { } @Override - public float getChance( - World world, - int x, - int y, - int z, - IAllele allele0, - IAllele allele1, - IGenome genome0, - IGenome genome1, - IClimateProvider climate) { + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, + IGenome genome1, IClimateProvider climate) { if (climate.getBiome().biomeID == biomeID) return 1; return 0; } diff --git a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java index 0d1a164992..ff44ae8591 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java @@ -7,16 +7,18 @@ import static gregtech.loaders.misc.GT_BeeDefinition.getFlowers; import static gregtech.loaders.misc.GT_BeeDefinitionReference.EXTRABEES; import static gregtech.loaders.misc.GT_BeeDefinitionReference.MAGICBEES; +import java.util.Arrays; +import java.util.function.Consumer; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.apiculture.genetics.alleles.AlleleEffect; import forestry.core.genetics.alleles.AlleleHelper; -import java.util.Arrays; -import java.util.function.Consumer; public enum GT_BranchDefinition { + ORGANIC("Fuelis", alleles -> { AlleleHelper.instance.set(alleles, TEMPERATURE_TOLERANCE, Tolerance.NONE); AlleleHelper.instance.set(alleles, HUMIDITY_TOLERANCE, Tolerance.BOTH_2); diff --git a/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java b/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java index 7caf0b24aa..d393dbc831 100644 --- a/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java +++ b/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java @@ -3,21 +3,25 @@ package gregtech.loaders.misc; import static gregtech.api.enums.Textures.BlockIcons.VENT_ADVANCED; import static gregtech.api.enums.Textures.BlockIcons.VENT_NORMAL; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; import gregtech.common.covers.GT_Cover_Vent; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class GT_CoverLoader implements Runnable { + @Override public void run() { for (byte i = 0; i < 16; i = (byte) (i + 1)) { GregTech_API.registerCover(new ItemStack(Blocks.carpet, 1, i), TextureFactory.of(Blocks.wool, i), null); } GregTech_API.registerCover( - GT_ModHandler.getIC2Item("reactorVent", 1L, 1), TextureFactory.of(VENT_NORMAL), new GT_Cover_Vent(1)); + GT_ModHandler.getIC2Item("reactorVent", 1L, 1), + TextureFactory.of(VENT_NORMAL), + new GT_Cover_Vent(1)); GregTech_API.registerCover( GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1), TextureFactory.of(VENT_NORMAL), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java index 5767332ee7..bdd1109a93 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java @@ -1,18 +1,20 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import net.minecraft.item.ItemStack; -public class ProcessingAll - implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO ACTUALLY COMPARE ALL THE PROCESSING CLASSES +public class ProcessingAll implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO ACTUALLY COMPARE ALL THE + // PROCESSING CLASSES + public ProcessingAll() { for (OrePrefixes tPrefix : OrePrefixes.values()) tPrefix.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock)) && (aPrefix.mDefaultStackSize < aStack.getItem().getItemStackLimit(aStack))) aStack.getItem().setMaxStackSize(aPrefix.mDefaultStackSize); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java index a66d17293f..6c1d1896b1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java @@ -1,23 +1,25 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.item.ItemStack; public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingArrows() { OrePrefixes.arrowGtWood.add(this); OrePrefixes.arrowGtPlastic.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { ItemStack tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( @@ -57,7 +59,14 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis Enchantment.fireAspect, EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), Materials.Blaze.getMolten(18L), tOutput, null, null, null, 100, 2); + GT_Utility.copyAmount(1L, aStack), + Materials.Blaze.getMolten(18L), + tOutput, + null, + null, + null, + 100, + 2); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); @@ -66,53 +75,48 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis Enchantment.knockback, EnchantmentHelper.getEnchantmentLevel(Enchantment.knockback.effectId, tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), Materials.Rubber.getMolten(18L), tOutput, null, null, null, 100, 2); + GT_Utility.copyAmount(1L, aStack), + Materials.Rubber.getMolten(18L), + tOutput, + null, + null, + null, + 100, + 2); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( tOutput, gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE, - EnchantmentHelper.getEnchantmentLevel( - gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + EnchantmentHelper + .getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(25L), tOutput, null, null, null, 100, 2); + GT_Utility.copyAmount(1L, aStack), + Materials.Mercury.getFluid(25L), + tOutput, + null, + null, + null, + 100, + 2); - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aPrefix) { case arrowGtWood: GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - " A", - " S ", - "F ", - 'S', - OrePrefixes.stick.get(Materials.Wood), - 'F', - OreDictNames.craftingFeather, - 'A', - OrePrefixes.toolHeadArrow.get(aMaterial) - }); + new Object[] { " A", " S ", "F ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', + OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) }); case arrowGtPlastic: GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.arrowGtPlastic, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - " A", - " S ", - "F ", - 'S', - OrePrefixes.stick.get(Materials.Plastic), - 'F', - OreDictNames.craftingFeather, - 'A', - OrePrefixes.toolHeadArrow.get(aMaterial) - }); + new Object[] { " A", " S ", "F ", 'S', OrePrefixes.stick.get(Materials.Plastic), 'F', + OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) }); default: break; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java index 35af7d302f..9fdf755c8a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java @@ -1,22 +1,24 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingBeans() { OrePrefixes.beans.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (aOreDictName.equals("beansCocoa")) - GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + if (aOreDictName.equals("beansCocoa")) GT_ModHandler.addPulverisationRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index a4619d2ea2..4043ea02aa 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -2,30 +2,29 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingBlock() { OrePrefixes.block.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_Values.RA.addCutterRecipe( GT_Utility.copyAmount(1L, aStack), - aMaterial == MaterialsBotania.Livingrock - || aMaterial == MaterialsBotania.Livingwood - || aMaterial == MaterialsBotania.Dreamwood - ? GT_Utility.getIntegratedCircuit(3) - : null, + aMaterial == MaterialsBotania.Livingrock || aMaterial == MaterialsBotania.Livingwood + || aMaterial == MaterialsBotania.Dreamwood ? GT_Utility.getIntegratedCircuit(3) : null, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), null, (int) Math.max(aMaterial.getMass() * 10L, 1L), @@ -39,15 +38,21 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack)); - if (tStack1 != null) - GT_ModHandler.removeRecipeDelayed( - tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1); - if (tStack2 != null) - GT_ModHandler.removeRecipeDelayed( - tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2); + if (tStack1 != null) GT_ModHandler + .removeRecipeDelayed(tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1); + if (tStack2 != null) GT_ModHandler + .removeRecipeDelayed(tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2); if (tStack3 != null) { GT_ModHandler.removeRecipeDelayed( - tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3); + tStack3, + tStack3, + tStack3, + tStack3, + tStack3, + tStack3, + tStack3, + tStack3, + tStack3); } if (aMaterial.mStandardMoltenFluid != null) { @@ -66,18 +71,16 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist ConfigCategories.Recipes.storageblockcrafting, OrePrefixes.block.get(aMaterial).toString(), false)) { - if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] {"XXX", "XXX", "XXX", 'X', OrePrefixes.dust.get(aMaterial)}); - if (tStack2 != null) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] {"XXX", "XXX", "XXX", 'X', OrePrefixes.gem.get(aMaterial)}); + if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.dust.get(aMaterial) }); + if (tStack2 != null) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.gem.get(aMaterial) }); if (tStack1 != null) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] {"XXX", "XXX", "XXX", 'X', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.ingot.get(aMaterial) }); } } if (tStack1 != null) tStack1.stackSize = 9; @@ -90,11 +93,11 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist OrePrefixes.block.get(aMaterial).toString(), tStack2 != null)) { if (tStack3 != null) - GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] {OrePrefixes.block.get(aMaterial)}); + GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); if (tStack2 != null) - GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] {OrePrefixes.block.get(aMaterial)}); + GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) }); if (tStack1 != null) - GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] {OrePrefixes.block.get(aMaterial)}); + GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) }); } if (!OrePrefixes.block.isIgnored(aMaterial)) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java index a758148e5f..96acfa1f17 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java @@ -1,26 +1,28 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingBolt() { OrePrefixes.bolt.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { - GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(2L, aStack), GT_Proxy.tBits, new Object[] { - "s ", " X", 'X', OrePrefixes.stick.get(aMaterial) - }); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(2L, aStack), + GT_Proxy.tBits, + new Object[] { "s ", " X", 'X', OrePrefixes.stick.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index 04e456a189..aa478a5560 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -1,5 +1,9 @@ package gregtech.loaders.oreprocessing; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -9,18 +13,17 @@ import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; public class ProcessingCell implements IOreRecipeRegistrator { + public ProcessingCell() { OrePrefixes.cell.add(this); OrePrefixes.cellPlasma.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aPrefix) { case cell: if (aMaterial == Materials.Empty) { @@ -44,10 +47,10 @@ public class ProcessingCell implements IOreRecipeRegistrator { tAllAmount = (int) (tAllAmount + tMat2.mAmount); } long tItemAmount = 0L; - long tCapsuleCount = - GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(aStack) * -tAllAmount; - long tDensityMultiplier = - aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L : 1L; + long tCapsuleCount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(aStack) + * -tAllAmount; + long tDensityMultiplier = aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L + : 1L; ArrayList<ItemStack> tList = new ArrayList<>(); for (MaterialStack tMat : aMaterial.mMaterialList) { if (tMat.mAmount > 0L) { @@ -57,8 +60,8 @@ public class ProcessingCell implements IOreRecipeRegistrator { } else { tStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); if (tStack == null) { - tStack = GT_OreDictUnificator.get( - OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); + tStack = GT_OreDictUnificator + .get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); } } if (tItemAmount + tMat.mAmount * 3628800L @@ -68,26 +71,20 @@ public class ProcessingCell implements IOreRecipeRegistrator { tStack.stackSize = ((int) (tStack.stackSize * tDensityMultiplier)); while ((tStack.stackSize > 64) && (tCapsuleCount - + GT_ModHandler.getCapsuleCellContainerCount( - tStack) - * 64L - < 0L - ? tList.size() < 5 - : tList.size() < 6) + + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L < 0L + ? tList.size() < 5 + : tList.size() < 6) && (tCapsuleCount - + GT_ModHandler.getCapsuleCellContainerCount(tStack) - * 64L + + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L <= 64L)) { tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L; tList.add(GT_Utility.copyAmount(64L, tStack)); tStack.stackSize -= 64; } - int tThisCapsuleCount = - GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - tStack); + int tThisCapsuleCount = GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize(tStack); if (tStack.stackSize > 0 && tCapsuleCount + tThisCapsuleCount <= 64L) { - if (tCapsuleCount + tThisCapsuleCount < 0L - ? tList.size() < 5 + if (tCapsuleCount + tThisCapsuleCount < 0L ? tList.size() < 5 : tList.size() < 6) { tCapsuleCount += tThisCapsuleCount; tList.add(tStack); @@ -110,8 +107,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { tList.size() >= 3 ? tList.get(2) : null, tList.size() >= 4 ? tList.get(3) : null, tList.size() >= 5 ? tList.get(4) : null, - tCapsuleCount >= 0L - ? tList.size() >= 6 ? tList.get(5) : null + tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null : ItemList.Cell_Empty.get(-tCapsuleCount), (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), Math.min(4, tList.size()) * 30); @@ -125,8 +121,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { tList.size() >= 3 ? tList.get(2) : null, tList.size() >= 4 ? tList.get(3) : null, tList.size() >= 5 ? tList.get(4) : null, - tCapsuleCount >= 0L - ? tList.size() >= 6 ? tList.get(5) : null + tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null : tCellBalance < 0 ? ItemList.Cell_Empty.get(-tCellBalance) : null, (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 8L * tItemAmount)), Math.min(4, tList.size()) * 30); @@ -141,8 +136,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { tList.size() >= 3 ? tList.get(2) : null, tList.size() >= 4 ? tList.get(3) : null, tList.size() >= 5 ? tList.get(4) : null, - tCapsuleCount >= 0L - ? tList.size() >= 6 ? tList.get(5) : null + tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null : ItemList.Cell_Empty.get(-tCapsuleCount), (int) Math.max(1L, Math.abs(aMaterial.getMass() * 2L * tItemAmount))); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index 32e7d9b7ac..643d6af903 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -1,20 +1,22 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCircuit() { OrePrefixes.circuit.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals("gregtech")) return; switch (aMaterial.mName) { case "Good": @@ -34,24 +36,17 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi break; case "Basic": GT_ModHandler.removeRecipeByOutputDelayed(aStack); - GT_ModHandler.addCraftingRecipe(aStack, GT_ModHandler.RecipeBits.BUFFERED, new Object[] { - "RIR", - "VBV", - "CCC", - 'R', - ItemList.Circuit_Parts_Resistor.get(1), - 'C', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1), - 'V', - ItemList.Circuit_Parts_Vacuum_Tube.get(1), - 'B', - ItemList.Circuit_Board_Coated_Basic.get(1), - 'I', - ItemList.IC2_Item_Casing_Steel.get(1) - }); + GT_ModHandler.addCraftingRecipe( + aStack, + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "RIR", "VBV", "CCC", 'R', ItemList.Circuit_Parts_Resistor.get(1), 'C', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1), 'V', + ItemList.Circuit_Parts_Vacuum_Tube.get(1), 'B', + ItemList.Circuit_Board_Coated_Basic.get(1), 'I', + ItemList.IC2_Item_Casing_Steel.get(1) }); GT_ModHandler.addShapelessCraftingRecipe( GT_ModHandler.getIC2Item("electronicCircuit", 1L), - new Object[] {ItemList.Circuit_Integrated.getWildcard(1L)}); + new Object[] { ItemList.Circuit_Integrated.getWildcard(1L) }); break; } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java index 7c17c7ca27..86478eb3d7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java @@ -1,24 +1,28 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; -import net.minecraft.item.ItemStack; public class ProcessingCompressed implements IOreRecipeRegistrator { + public ProcessingCompressed() { OrePrefixes.compressed.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); GregTech_API.registerCover( - aStack, TextureFactory.of(aMaterial.mIconSet.mTextures[72], aMaterial.mRGBa, false), null); + aStack, + TextureFactory.of(aMaterial.mIconSet.mTextures[72], aMaterial.mRGBa, false), + null); // GT_RecipeRegistrator.registerUsagesForMaterials(null, false, GT_Utility.copyAmount(1L, aStack)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index 48d9708f4a..84fbf9c05d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -2,6 +2,9 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.enums.GT_Values.MOD_ID_DC; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -9,17 +12,16 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCrafting() { OrePrefixes.crafting.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aOreDictName) { case "craftingQuartz": GT_Values.RA.addAssemblerRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java index 042580144b..79c5ca9874 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java @@ -1,13 +1,15 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCrate() { OrePrefixes.crateGtDust.add(this); OrePrefixes.crateGtIngot.add(this); @@ -16,10 +18,9 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - boolean aSpecialRecipeReq2 = aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING); switch (aPrefix) { case crateGtDust: @@ -35,11 +36,10 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L), 800, 1); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] {"Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial)}); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial) }); break; case crateGtIngot: GT_Values.RA.addBoxingRecipe( @@ -54,11 +54,10 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L), 800, 1); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] {"Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial)}); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial) }); break; case crateGtGem: GT_Values.RA.addBoxingRecipe( @@ -73,11 +72,10 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L), 800, 1); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] {"Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial)}); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial) }); break; case crateGtPlate: GT_Values.RA.addBoxingRecipe( @@ -92,11 +90,10 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L), 800, 1); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] {"Xc", 'X', OrePrefixes.crateGtPlate.get(aMaterial)}); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtPlate.get(aMaterial) }); break; default: break; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index ceb7aee979..9062533d93 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -1,27 +1,26 @@ package gregtech.loaders.oreprocessing; +import net.minecraftforge.fluids.FluidRegistry; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraftforge.fluids.FluidRegistry; public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCrop() { OrePrefixes.crop.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, - Materials aMaterial, - String aOreDictName, - String aModName, + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, net.minecraft.item.ItemStack aStack) { GT_ModHandler.addCompressionRecipe( - gregtech.api.util.GT_Utility.copyAmount(8L, aStack), ItemList.IC2_PlantballCompressed.get(1L)); + gregtech.api.util.GT_Utility.copyAmount(8L, aStack), + ItemList.IC2_PlantballCompressed.get(1L)); switch (aOreDictName) { case "cropTea": GT_Values.RA.addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.tea"), false); @@ -33,7 +32,10 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr break; case "cropGrape": GT_Values.RA.addBrewingRecipe( - aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.grapejuice"), false); + aStack, + FluidRegistry.WATER, + FluidRegistry.getFluid("potion.grapejuice"), + false); GT_Values.RA.addBrewingRecipe( aStack, GT_ModHandler.getDistilledWater(1L).getFluid(), @@ -42,19 +44,32 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr break; case "cropChilipepper": GT_ModHandler.addPulverisationRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)); + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)); break; case "cropCoffee": GT_ModHandler.addPulverisationRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)); + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)); break; case "cropPotato": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Raw_PotatoChips.get(1L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Raw_PotatoChips.get(1L), + 64, + 4); GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Stripes.get(0L), ItemList.Food_Raw_Fries.get(1L), 64, 4); + aStack, + ItemList.Shape_Slicer_Stripes.get(0L), + ItemList.Food_Raw_Fries.get(1L), + 64, + 4); GT_Values.RA.addBrewingRecipe( - aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.potatojuice"), true); + aStack, + FluidRegistry.WATER, + FluidRegistry.getFluid("potion.potatojuice"), + true); GT_Values.RA.addBrewingRecipe( aStack, GT_ModHandler.getDistilledWater(1L).getFluid(), @@ -63,9 +78,16 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr break; case "cropLemon": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Lemon.get(4L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Lemon.get(4L), + 64, + 4); GT_Values.RA.addBrewingRecipe( - aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.lemonjuice"), false); + aStack, + FluidRegistry.WATER, + FluidRegistry.getFluid("potion.lemonjuice"), + false); GT_Values.RA.addBrewingRecipe( aStack, GT_ModHandler.getDistilledWater(1L).getFluid(), @@ -79,15 +101,27 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr break; case "cropTomato": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Tomato.get(4L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Tomato.get(4L), + 64, + 4); break; case "cropCucumber": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Cucumber.get(4L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Cucumber.get(4L), + 64, + 4); break; case "cropOnion": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Onion.get(4L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Onion.get(4L), + 64, + 4); break; } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index e9b954f52e..77d20209b8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -1,22 +1,24 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCrushedOre() { OrePrefixes.crushedCentrifuged.add(this); OrePrefixes.crushedPurified.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aPrefix) { case crushedCentrifuged: GT_Values.RA.addForgeHammerRecipe( @@ -37,7 +39,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR case crushedPurified: GT_ModHandler.addThermalCentrifugeRecipe( GT_Utility.copyAmount(1L, aStack), - new int[] {10000, 1111}, + new int[] { 10000, 1111 }, (int) Math.min(5000L, Math.abs(aMaterial.getMass() * 20L)), GT_OreDictUnificator.get( OrePrefixes.crushedCentrifuged, @@ -71,14 +73,12 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR GT_Values.RA.addSifterRecipe( GT_Utility.copyAmount(1L, aStack), new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), - tGem, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) - }, - new int[] {300, 1200, 4500, 1400, 2800, 3500}, + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), + tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, + new int[] { 300, 1200, 4500, 1400, 2800, 3500 }, 800, 16); break; @@ -86,14 +86,12 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR GT_Values.RA.addSifterRecipe( GT_Utility.copyAmount(1L, aStack), new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), - tGem, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) - }, - new int[] {100, 400, 1500, 2000, 4000, 5000}, + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), + tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, + new int[] { 100, 400, 1500, 2000, 4000, 5000 }, 800, 16); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java index ccd11b5d88..df2284a95c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java @@ -1,22 +1,24 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCrystallized() { OrePrefixes.crystal.add(this); OrePrefixes.crystalline.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index cc0b25345c..e9a1b0425c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -10,6 +10,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingDirty() { OrePrefixes.clump.add(this); OrePrefixes.shard.add(this); @@ -18,11 +19,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist } @Override - public void registerOre( - OrePrefixes aPrefix, - Materials aMaterial, - String aOreDictName, - String aModName, + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, net.minecraft.item.ItemStack aStack) { GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(1L, aStack), @@ -44,7 +41,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist false); GT_ModHandler.addOreWasherRecipe( GT_Utility.copyAmount(1L, aStack), - new int[] {10000, 1111, 10000}, + new int[] { 10000, 1111, 10000 }, 1000, GT_OreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, @@ -57,7 +54,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)); GT_ModHandler.addThermalCentrifugeRecipe( GT_Utility.copyAmount(1L, aStack), - new int[] {10000, 1111, 10000}, + new int[] { 10000, 1111, 10000 }, (int) Math.min(5000L, Math.abs(aMaterial.getMass() * 20L)), GT_OreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedCentrifuged : OrePrefixes.dust, @@ -69,86 +66,79 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)); - if (aMaterial.contains(SubTag.WASHING_MERCURY)) - GT_Values.RA.addChemicalBathRecipe( + if (aMaterial.contains(SubTag.WASHING_MERCURY)) GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.Mercury.getFluid(1000L), + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), + new int[] { 10000, 7000, 4000 }, + 800, + 8); + if (aMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.Mercury.getFluid(1000L), + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), + new int[] { 10000, 9900, 4000 }, + 800, + 8); + if (aMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.SodiumPersulfate.getFluid(GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L), + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), + new int[] { 10000, 7000, 4000 }, + 800, + 8); + for (Materials tMaterial : aMaterial.mOreByProducts) { + if (tMaterial.contains(SubTag.WASHING_MERCURY)) GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(1000L), GT_OreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 7000, 4000}, + new int[] { 10000, 7000, 4000 }, 800, 8); - if (aMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) - GT_Values.RA.addChemicalBathRecipe( + if (tMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(1000L), GT_OreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 9900, 4000}, + new int[] { 10000, 9900, 4000 }, 800, 8); - if (aMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) - GT_Values.RA.addChemicalBathRecipe( + if (tMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.SodiumPersulfate.getFluid(GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L), GT_OreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 7000, 4000}, + new int[] { 10000, 7000, 4000 }, 800, 8); - for (Materials tMaterial : aMaterial.mOreByProducts) { - if (tMaterial.contains(SubTag.WASHING_MERCURY)) - GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Mercury.getFluid(1000L), - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 7000, 4000}, - 800, - 8); - if (tMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) - GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Mercury.getFluid(1000L), - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 9900, 4000}, - 800, - 8); - if (tMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) - GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.SodiumPersulfate.getFluid( - GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L), - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 7000, 4000}, - 800, - 8); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 3d4c13ecaa..75ba5cc4af 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -1,5 +1,10 @@ package gregtech.loaders.oreprocessing; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -11,11 +16,9 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_RecipeRegistrator; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingDust() { OrePrefixes.dust.add(this); OrePrefixes.dustPure.add(this); @@ -26,13 +29,12 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aPrefix) { case dust: - if (aMaterial.mFuelPower > 0) - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); + if (aMaterial.mFuelPower > 0) GT_Values.RA + .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); if (GT_Utility.getFluidForFilledItem(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), true) == null) GT_Values.RA.addCannerRecipe( @@ -67,8 +69,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null, null, aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) + ? GT_OreDictUnificator + .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) : GT_Utility.copyAmount(1L, tDustStack), null, (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, @@ -87,7 +89,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } // This is so disgustingly bad. if (((OrePrefixes.block.isIgnored(aMaterial)) - || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) + || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Basalt) @@ -107,49 +109,41 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if ((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0)) { long tItemAmount = 0L; long tCapsuleCount = 0L; - long tDensityMultiplier = - aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L : 1L; + long tDensityMultiplier = aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L + : 1L; ArrayList<ItemStack> tList = new ArrayList<>(); - for (MaterialStack tMat : aMaterial.mMaterialList) - if (tMat.mAmount > 0L) { - if (tMat.mMaterial == Materials.Air) { - tDustStack = ItemList.Cell_Air.get(tMat.mAmount / 2L); - } else { - tDustStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); - if (tDustStack == null) - tDustStack = - GT_OreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); - } - if (tItemAmount + tMat.mAmount * 3628800L - <= aStack.getMaxStackSize() * aMaterial.getDensity()) { - tItemAmount += tMat.mAmount * 3628800L; - if (tDustStack != null) { - tDustStack.stackSize = ((int) (tDustStack.stackSize * tDensityMultiplier)); - while ((tDustStack.stackSize > 64) - && (tList.size() < 6) - && (tCapsuleCount - + GT_ModHandler.getCapsuleCellContainerCount(tDustStack) - * 64 - <= 64L)) { - tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64; - tList.add(GT_Utility.copyAmount(64L, tDustStack)); - tDustStack.stackSize -= 64; - } - if ((tDustStack.stackSize > 0) - && (tList.size() < 6) - && (tCapsuleCount - + GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize( - tDustStack) - <= 64L)) { - tCapsuleCount += - GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - tDustStack); - tList.add(tDustStack); - } + for (MaterialStack tMat : aMaterial.mMaterialList) if (tMat.mAmount > 0L) { + if (tMat.mMaterial == Materials.Air) { + tDustStack = ItemList.Cell_Air.get(tMat.mAmount / 2L); + } else { + tDustStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); + if (tDustStack == null) + tDustStack = GT_OreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); + } + if (tItemAmount + tMat.mAmount * 3628800L + <= aStack.getMaxStackSize() * aMaterial.getDensity()) { + tItemAmount += tMat.mAmount * 3628800L; + if (tDustStack != null) { + tDustStack.stackSize = ((int) (tDustStack.stackSize * tDensityMultiplier)); + while ((tDustStack.stackSize > 64) && (tList.size() < 6) + && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64 + <= 64L)) { + tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64; + tList.add(GT_Utility.copyAmount(64L, tDustStack)); + tDustStack.stackSize -= 64; + } + if ((tDustStack.stackSize > 0) && (tList.size() < 6) + && (tCapsuleCount + + GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack) + <= 64L)) { + tCapsuleCount += GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack); + tList.add(tDustStack); } } } + } tItemAmount = (tItemAmount * tDensityMultiplier % aMaterial.getDensity() > 0L ? 1 : 0) + tItemAmount * tDensityMultiplier / aMaterial.getDensity(); if (tList.size() > 0) { @@ -160,27 +154,26 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && ((tFluid = GT_Utility.getFluidForFilledItem((ItemStack) tList.get(i), true)) != null)) { tFluid.amount *= tList.get(i).stackSize; - tCapsuleCount -= GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - (ItemStack) tList.get(i)); + tCapsuleCount -= GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize((ItemStack) tList.get(i)); tList.remove(i); break; } } - if ((aMaterial.mExtraData & 0x1) != 0) - GT_Values.RA.addElectrolyzerRecipe( - GT_Utility.copyAmount(tItemAmount, aStack), - tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, - null, - tFluid, - tList.size() < 1 ? null : (ItemStack) tList.get(0), - tList.size() < 2 ? null : (ItemStack) tList.get(1), - tList.size() < 3 ? null : (ItemStack) tList.get(2), - tList.size() < 4 ? null : (ItemStack) tList.get(3), - tList.size() < 5 ? null : (ItemStack) tList.get(4), - tList.size() < 6 ? null : (ItemStack) tList.get(5), - null, - (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), - Math.min(4, tList.size()) * 30); + if ((aMaterial.mExtraData & 0x1) != 0) GT_Values.RA.addElectrolyzerRecipe( + GT_Utility.copyAmount(tItemAmount, aStack), + tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, + null, + tFluid, + tList.size() < 1 ? null : (ItemStack) tList.get(0), + tList.size() < 2 ? null : (ItemStack) tList.get(1), + tList.size() < 3 ? null : (ItemStack) tList.get(2), + tList.size() < 4 ? null : (ItemStack) tList.get(3), + tList.size() < 5 ? null : (ItemStack) tList.get(4), + tList.size() < 6 ? null : (ItemStack) tList.get(5), + null, + (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), + Math.min(4, tList.size()) * 30); if ((aMaterial.mExtraData & 0x2) != 0) { GT_Values.RA.addCentrifugeRecipe( GT_Utility.copyAmount(tItemAmount, aStack), @@ -234,7 +227,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr break; case "Glass": GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), new ItemStack(net.minecraft.init.Blocks.glass)); + GT_Utility.copyAmount(1L, aStack), + new ItemStack(net.minecraft.init.Blocks.glass)); break; case "NetherQuartz": case "Quartz": @@ -242,7 +236,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if (gregtech.api.GregTech_API.sRecipeFile.get( gregtech.api.enums.ConfigCategories.Recipes.disabledrecipes, "QuartzDustSmeltingIntoAESilicon", - true)) GT_ModHandler.removeFurnaceSmelting(aStack); + true)) + GT_ModHandler.removeFurnaceSmelting(aStack); break; case "MeatRaw": GT_ModHandler.addSmeltingRecipe( @@ -254,11 +249,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr case "Oilsands": GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( true, - new ItemStack[] {GT_Utility.copyAmount(1L, aStack)}, + new ItemStack[] { GT_Utility.copyAmount(1L, aStack) }, null, null, null, - new FluidStack[] {Materials.OilHeavy.getFluid(1000)}, + new FluidStack[] { Materials.OilHeavy.getFluid(1000) }, 660, 8, 0); @@ -324,7 +319,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gold, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L), - new int[] {10000, 4000, 2000}, + new int[] { 10000, 4000, 2000 }, 400, 24); if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_IRON)) @@ -333,7 +328,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L), - new int[] {10000, 4000, 2000}, + new int[] { 10000, 4000, 2000 }, 400, 24); if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM)) { @@ -342,7 +337,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neodymium, 1L), - new int[] {10000, 4000, 2000}, + new int[] { 10000, 4000, 2000 }, 400, 24); } @@ -474,7 +469,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null, null, null, - new int[] {10000, 1111}, + new int[] { 10000, 1111 }, (int) Math.max(1L, aMaterial.getMass() * 8L), 5); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java index 573081b6cc..42b5571b2b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java @@ -1,5 +1,11 @@ package gregtech.loaders.oreprocessing; +import java.util.Locale; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; + import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -8,19 +14,16 @@ import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import java.util.Locale; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; public class ProcessingDye implements IOreRecipeRegistrator { + public ProcessingDye() { OrePrefixes.dye.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { Dyes aDye = Dyes.get(aOreDictName); if ((aDye.mIndex >= 0) && (aDye.mIndex < 16) && (GT_Utility.getContainerItem(aStack, true) == null)) { GT_ModHandler.addAlloySmelterRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java index 046bcf5cda..941191132d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; @@ -7,25 +9,25 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_RecipeRegistrator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingFineWire implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingFineWire() { OrePrefixes.wireFine.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { GT_RecipeRegistrator.registerWiremillRecipes(aMaterial, 100, 4); } - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { - GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(1L, aStack), GT_Proxy.tBits, new Object[] { - "Xx", 'X', OrePrefixes.foil.get(aMaterial) - }); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_Proxy.tBits, + new Object[] { "Xx", 'X', OrePrefixes.foil.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java index ae25bcee98..31f7051c3d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java @@ -2,6 +2,8 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -10,22 +12,24 @@ import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingFoil implements IOreRecipeRegistrator { + public ProcessingFoil() { OrePrefixes.foil.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L)), GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L), (int) Math.max(aMaterial.getMass(), 1L), calculateRecipeEU(aMaterial, 24)); GregTech_API.registerCover( - aStack, TextureFactory.of(aMaterial.mIconSet.mTextures[70], aMaterial.mRGBa, false), null); + aStack, + TextureFactory.of(aMaterial.mIconSet.mTextures[70], aMaterial.mRGBa, false), + null); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java index 905bb58fe7..bfd85af1a4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -7,26 +9,30 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingFood() { OrePrefixes.food.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aOreDictName) { case "foodCheese": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Cheese.get(4L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Cheese.get(4L), + 64, + 4); GT_OreDictUnificator.addItemData(aStack, new gregtech.api.objects.ItemData(Materials.Cheese, 3628800L)); break; case "foodDough": GT_ModHandler.removeFurnaceSmelting(aStack); - GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), ItemList.Food_Flat_Dough.get(1L), 16, 4); + GT_Values.RA + .addBenderRecipe(GT_Utility.copyAmount(1L, aStack), ItemList.Food_Flat_Dough.get(1L), 16, 4); GT_Values.RA.addMixerRecipe( aStack, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java index 606d3f0245..c1e767b9b5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java @@ -2,23 +2,25 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingGear() { OrePrefixes.gearGt.add(this); OrePrefixes.gearGtSmall.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aPrefix) { case gearGt: GT_ModHandler.removeRecipeByOutputDelayed(aStack); @@ -31,52 +33,30 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr 128, calculateRecipeEU(aMaterial, 8)); } - if (aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { case "Wood": GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "SPS", - "PsP", - "SPS", - 'P', - OrePrefixes.plank.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial) - }); + new Object[] { "SPS", "PsP", "SPS", 'P', OrePrefixes.plank.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial) }); break; case "Stone": GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "SPS", - "PfP", - "SPS", - 'P', - OrePrefixes.stoneSmooth, - 'S', - new ItemStack(Blocks.stone_button, 1, 32767) - }); + new Object[] { "SPS", "PfP", "SPS", 'P', OrePrefixes.stoneSmooth, 'S', + new ItemStack(Blocks.stone_button, 1, 32767) }); break; default: if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "SPS", - "PwP", - "SPS", - 'P', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial) - }); + new Object[] { "SPS", "PwP", "SPS", 'P', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial) }); } } } @@ -91,36 +71,28 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr 16, calculateRecipeEU(aMaterial, 8)); } - if (aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { case "Wood": GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"P ", " s", 'P', OrePrefixes.plank.get(aMaterial)}); + new Object[] { "P ", " s", 'P', OrePrefixes.plank.get(aMaterial) }); break; case "Stone": GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"P ", " f", 'P', OrePrefixes.stoneSmooth}); + new Object[] { "P ", " f", 'P', OrePrefixes.stoneSmooth }); break; default: if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - " S ", - "hPx", - " S ", - 'S', - OrePrefixes.stick.get(aMaterial), - 'P', - OrePrefixes.plate.get(aMaterial) - }); + new Object[] { " S ", "hPx", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 929ad579ad..0a3315a259 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -2,17 +2,19 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -public class ProcessingGem - implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH GEM??? generators +public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH GEM??? + // generators + public ProcessingGem() { OrePrefixes.gem.add(this); OrePrefixes.gemChipped.add(this); @@ -22,8 +24,8 @@ public class ProcessingGem } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { long aMaterialMass = aMaterial.getMass(); boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); @@ -36,7 +38,10 @@ public class ProcessingGem case gem: if (aFuelPower) { GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower * 2, aMaterial.mFuelType); + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower * 2, + aMaterial.mFuelType); } if (!OrePrefixes.block.isIgnored(aMaterial)) { GT_ModHandler.addCompressionRecipe( @@ -50,7 +55,10 @@ public class ProcessingGem } if (aNoSmashing) { GT_Values.RA.addForgeHammerRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), 64, 16); + aStack, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), + 64, + 16); } else { GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(1L, aStack), @@ -103,22 +111,20 @@ public class ProcessingGem GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"h", "X", 'X', OrePrefixes.gemFlawless.get(aMaterial)}); + new Object[] { "h", "X", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); GT_Values.RA.addImplosionRecipe( GT_Utility.copyAmount(3L, aStack), 8, GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)); - if (aMaterial.contains(SubTag.SMELTING_TO_GEM)) - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Proxy.tBits, - new Object[] {"XXX", "XXX", "XXX", 'X', OrePrefixes.nugget.get(aMaterial)}); - if (aSpecialRecipeReq) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"X", "m", 'X', OrePrefixes.gem.get(aMaterial)}); + if (aMaterial.contains(SubTag.SMELTING_TO_GEM)) GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_Proxy.tBits, + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.nugget.get(aMaterial) }); + if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gem.get(aMaterial) }); } } // GT_RecipeRegistrator.registerUsagesForMaterials(OrePrefixes.plate.get(aMaterial).toString(), @@ -153,8 +159,9 @@ public class ProcessingGem 2000, 30); } - for (ItemStack is : OreDictionary.getOres( - "craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver Recipe adder + for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -165,9 +172,11 @@ public class ProcessingGem } break; case gemChipped: - if (aFuelPower) - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower / 2, aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower / 2, + aMaterial.mFuelType); if (!aNoWorking) { GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), @@ -184,16 +193,16 @@ public class ProcessingGem GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"h", "X", 'X', OrePrefixes.gemFlawed.get(aMaterial)}); - if (aSpecialRecipeReq) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"X", "m", 'X', OrePrefixes.gemChipped.get(aMaterial)}); + new Object[] { "h", "X", 'X', OrePrefixes.gemFlawed.get(aMaterial) }); + if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemChipped.get(aMaterial) }); } } - for (ItemStack is : OreDictionary.getOres( - "craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver Recipe adder + for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -204,24 +213,27 @@ public class ProcessingGem } break; case gemExquisite: - if (aFuelPower) - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower * 8, aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower * 8, + aMaterial.mFuelType); if (!aNoWorking) { if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) - if (aSpecialRecipeReq) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L), - GT_Proxy.tBits, - new Object[] {"X", "m", 'X', OrePrefixes.gemExquisite.get(aMaterial)}); + if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemExquisite.get(aMaterial) }); } GT_Values.RA.addForgeHammerRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), 64, 16); + aStack, + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), + 64, + 16); break; case gemFlawed: - if (aFuelPower) - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA + .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); if (!aNoWorking) { GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), @@ -238,18 +250,21 @@ public class ProcessingGem GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"h", "X", 'X', OrePrefixes.gem.get(aMaterial)}); - if (aSpecialRecipeReq) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] {"X", "m", 'X', OrePrefixes.gemFlawed.get(aMaterial)}); + new Object[] { "h", "X", 'X', OrePrefixes.gem.get(aMaterial) }); + if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemFlawed.get(aMaterial) }); } } GT_Values.RA.addForgeHammerRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), 64, 16); - for (ItemStack is : OreDictionary.getOres( - "craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver Recipe adder + aStack, + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), + 64, + 16); + for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -260,15 +275,18 @@ public class ProcessingGem } break; case gemFlawless: - if (aFuelPower) - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower * 4, aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower * 4, + aMaterial.mFuelType); if (!aNoWorking) { GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), GT_OreDictUnificator.getDust( - aMaterial, aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount), + aMaterial, + aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount), (int) Math.max(aMaterialMass * 5L, 1L), 16); if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { @@ -280,18 +298,18 @@ public class ProcessingGem GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"h", "X", 'X', OrePrefixes.gemExquisite.get(aMaterial)}); - if (aSpecialRecipeReq) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] {"X", "m", 'X', OrePrefixes.gemFlawless.get(aMaterial)}); + new Object[] { "h", "X", 'X', OrePrefixes.gemExquisite.get(aMaterial) }); + if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); } } - GT_Values.RA.addForgeHammerRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), 64, 16); - for (ItemStack is : OreDictionary.getOres( - "craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver Recipe adder + GT_Values.RA + .addForgeHammerRecipe(aStack, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), 64, 16); + for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index aa8964f9be..bc2534204a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -2,6 +2,8 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; @@ -9,9 +11,9 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_RecipeRegistrator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingIngot() { OrePrefixes.ingot.add(this); OrePrefixes.ingotDouble.add(this); @@ -22,20 +24,22 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); boolean aNoSmelting = aMaterial.contains(SubTag.NO_SMELTING); long aMaterialMass = aMaterial.getMass(); - boolean aSpecialRecipeReq = aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + boolean aSpecialRecipeReq = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_SMASHING); switch (aPrefix) { case ingot: if (aMaterial.mFuelPower > 0) { GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower, + aMaterial.mFuelType); } if (aMaterial.mStandardMoltenFluid != null) { if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { @@ -48,11 +52,16 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator.registerReverseMacerating( - aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); + GT_RecipeRegistrator + .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1L, aStack), aMaterial, aPrefix.mMaterialAmount, null, null, null); + GT_Utility.copyAmount(1L, aStack), + aMaterial, + aPrefix.mMaterialAmount, + null, + null, + null); } ItemStack tStack; if ((null != (tStack = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L))) @@ -60,16 +69,14 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.removeFurnaceSmelting(tStack); } - if (aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { - if (!aMaterial.contains(SubTag.SMELTING_TO_GEM)) - if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) - && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {ToolDictNames.craftingToolMortar, OrePrefixes.ingot.get(aMaterial)}); + if (!aMaterial.contains(SubTag.SMELTING_TO_GEM)) if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) + && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.ingot.get(aMaterial) }); } if (!aNoSmashing) { @@ -134,13 +141,12 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Enable crafting with hammer if tier is < IV. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile + .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial) }); } } } @@ -158,21 +164,13 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist (int) Math.max(aMaterialMass * 3L, 1L), calculateRecipeEU(aMaterial, 96)); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile + .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "I", - "B", - "h", - 'I', - OrePrefixes.ingotDouble.get(aMaterial), - 'B', - OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotDouble.get(aMaterial), 'B', + OrePrefixes.ingot.get(aMaterial) }); } } } @@ -187,21 +185,13 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // If tier < IV add manual crafting. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile + .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "I", - "B", - "h", - 'I', - OrePrefixes.ingotTriple.get(aMaterial), - 'B', - OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotTriple.get(aMaterial), 'B', + OrePrefixes.ingot.get(aMaterial) }); } } } @@ -215,21 +205,13 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist calculateRecipeEU(aMaterial, 96)); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile + .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "I", - "B", - "h", - 'I', - OrePrefixes.ingotQuadruple.get(aMaterial), - 'B', - OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotQuadruple.get(aMaterial), 'B', + OrePrefixes.ingot.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java index 5ed2c203aa..46bcc170f1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java @@ -1,21 +1,22 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; public class ProcessingItem implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingItem() { OrePrefixes.item.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (GT_OreDictUnificator.getItemData(aStack) == null - && !aOreDictName.equals("itemCertusQuartz") + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + if (GT_OreDictUnificator.getItemData(aStack) == null && !aOreDictName.equals("itemCertusQuartz") && !aOreDictName.equals("itemNetherQuartz")) { switch (aOreDictName) { case "itemSilicon": diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index c1771c4cee..6e3a8eac00 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -8,16 +10,16 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingLens() { OrePrefixes.lens.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aMaterial.mName) { case "Diamond": case "Glass": @@ -54,8 +56,8 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), 2400, 30); - final ITexture lensCoverTexture = - TextureFactory.of(Textures.BlockIcons.OVERLAY_LENS, aMaterial.mRGBa, false); + final ITexture lensCoverTexture = TextureFactory + .of(Textures.BlockIcons.OVERLAY_LENS, aMaterial.mRGBa, false); GregTech_API.registerCover( aStack, TextureFactory.of(Textures.BlockIcons.MACHINE_CASINGS[2][0], lensCoverTexture), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index 01d9fd63df..43b4e8b98f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -1,22 +1,24 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingLog() { OrePrefixes.log.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aOreDictName.equals("logRubber")) { GT_Values.RA.addCentrifugeRecipe( GT_Utility.copyAmount(1L, aStack), @@ -29,7 +31,7 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), GT_Values.NI, GT_Values.NI, - new int[] {5000, 3750, 2500, 2500}, + new int[] { 5000, 3750, 2500, 2500 }, 200, 20); GT_ModHandler.addSawmillRecipe( @@ -72,7 +74,7 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"sLf", 'L', GT_Utility.copyAmount(1L, aStack)}); + new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) }); GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L), @@ -110,8 +112,8 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile + .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); } } @@ -120,8 +122,8 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile + .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } } @@ -153,17 +155,20 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tPlanks, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)); GT_ModHandler.removeRecipeDelayed(new ItemStack(aStack.getItem(), 1, i)); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, - tStack), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"s", "L", 'L', new ItemStack(aStack.getItem(), 1, i)}); + GT_ModHandler + .addCraftingRecipe( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize + : tStack.stackSize * 5 / 4, + tStack), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount( - tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), + tStack), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {new ItemStack(aStack.getItem(), 1, i)}); + new Object[] { new ItemStack(aStack.getItem(), 1, i) }); } } } else { @@ -171,8 +176,8 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile + .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); } } @@ -200,15 +205,17 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tPlanks, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)); GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack)); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, - tStack), - new Object[] {"s", "L", 'L', GT_Utility.copyAmount(1L, aStack)}); + GT_ModHandler + .addCraftingRecipe( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize + : tStack.stackSize * 5 / 4, + tStack), + new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount( - tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), - new Object[] {GT_Utility.copyAmount(1L, aStack)}); + GT_Utility + .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + new Object[] { GT_Utility.copyAmount(1L, aStack) }); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java index 1a8e5011f1..d62da2e857 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java @@ -2,26 +2,27 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_RecipeRegistrator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingNugget() { OrePrefixes.nugget.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addAlloySmelterRecipe( GT_Utility.copyAmount(9L, aStack), - aMaterial.contains(SubTag.SMELTING_TO_GEM) - ? ItemList.Shape_Mold_Ball.get(0L) + aMaterial.contains(SubTag.SMELTING_TO_GEM) ? ItemList.Shape_Mold_Ball.get(0L) : ItemList.Shape_Mold_Ingot.get(0L), GT_OreDictUnificator.get( aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, @@ -41,8 +42,8 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator.registerReverseMacerating( - aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); + GT_RecipeRegistrator + .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); if (!aMaterial.contains(SubTag.NO_SMELTING)) { GT_Values.RA.addAlloySmelterRecipe( GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), @@ -54,7 +55,7 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 9L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"sI ", 'I', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "sI ", 'I', OrePrefixes.ingot.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 7764ded2db..0bc88296da 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -1,5 +1,9 @@ package gregtech.loaders.oreprocessing; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -8,26 +12,24 @@ import gregtech.api.enums.SubTag; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistrator { + private ArrayList<Materials> mAlreadyListedOres = new ArrayList(1000); public ProcessingOre() { for (OrePrefixes tPrefix : OrePrefixes.values()) - if ((tPrefix.name().startsWith("ore")) - && (tPrefix != OrePrefixes.orePoor) + if ((tPrefix.name().startsWith("ore")) && (tPrefix != OrePrefixes.orePoor) && (tPrefix != OrePrefixes.oreSmall) && (tPrefix != OrePrefixes.oreRich) - && (tPrefix != OrePrefixes.oreNormal)) tPrefix.add(this); + && (tPrefix != OrePrefixes.oreNormal)) + tPrefix.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - boolean tIsRich = (aPrefix == OrePrefixes.oreNetherrack) - || (aPrefix == OrePrefixes.oreNether) + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + boolean tIsRich = (aPrefix == OrePrefixes.oreNetherrack) || (aPrefix == OrePrefixes.oreNether) || (aPrefix == OrePrefixes.oreEndstone) || (aPrefix == OrePrefixes.oreEnd) || (aPrefix == OrePrefixes.oreRich) @@ -45,7 +47,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, null, - new int[] {tIsRich ? 2000 : 4000}, + new int[] { tIsRich ? 2000 : 4000 }, tIsRich ? 600 : 300, 30); } else { @@ -54,20 +56,22 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra aMaterial, GT_Utility.copyAmount(1L, aStack), Math.max( - 1, - gregtech.api.GregTech_API.sOPStuff.get( - gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier, - aMaterial.toString(), - 1)) + 1, + gregtech.api.GregTech_API.sOPStuff.get( + gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier, + aMaterial.toString(), + 1)) * (tIsRich ? 2 : 1)); } } - private boolean registerStandardOreRecipes( - OrePrefixes aPrefix, Materials aMaterial, ItemStack aOreStack, int aMultiplier) { + private boolean registerStandardOreRecipes(OrePrefixes aPrefix, Materials aMaterial, ItemStack aOreStack, + int aMultiplier) { if ((aOreStack == null) || (aMaterial == null)) return false; GT_ModHandler.addValuableOre( - GT_Utility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue); + GT_Utility.getBlockFromStack(aOreStack), + aOreStack.getItemDamage(), + aMaterial.mOreValue); Materials tMaterial = aMaterial.mOreReplacement; Materials tPrimaryByMaterial = null; aMultiplier = Math.max(1, aMultiplier); @@ -76,28 +80,28 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); - ItemStack tSmeltInto = tIngot == null - ? null - : aMaterial.contains(SubTag.SMELTING_TO_GEM) - ? GT_OreDictUnificator.get( - OrePrefixes.gem, - tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( - OrePrefixes.crystal, + ItemStack tSmeltInto = tIngot + == null ? null + : aMaterial.contains(SubTag.SMELTING_TO_GEM) + ? GT_OreDictUnificator.get( + OrePrefixes.gem, tMaterial.mDirectSmelting, GT_OreDictUnificator.get( - OrePrefixes.gem, - tMaterial, - GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), + OrePrefixes.crystal, + tMaterial.mDirectSmelting, + GT_OreDictUnificator.get( + OrePrefixes.gem, + tMaterial, + GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), + 1L), 1L), - 1L), - 1L) - : tIngot; + 1L) + : tIngot; ItemStack tDust = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); - ItemStack tCrushed = - GT_OreDictUnificator.get(OrePrefixes.crushed, tMaterial, aMaterial.mOreMultiplier * aMultiplier); + ItemStack tCrushed = GT_OreDictUnificator + .get(OrePrefixes.crushed, tMaterial, aMaterial.mOreMultiplier * aMultiplier); ItemStack tPrimaryByProduct = null; if (tCrushed == null) { @@ -116,20 +120,18 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra if (tPrimaryByProduct == null) { tPrimaryByMaterial = tMat; tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) - GT_OreDictUnificator.get( - OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) - GT_OreDictUnificator.get( - OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } if ((!tByProductStacks.isEmpty()) && (!this.mAlreadyListedOres.contains(aMaterial))) { this.mAlreadyListedOres.add(aMaterial); gregtech.api.util.GT_Recipe.GT_Recipe_Map.sByProductList.addFakeRecipe( false, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ore, aMaterial, aOreStack, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ore, aMaterial, aOreStack, 1L) }, (ItemStack[]) tByProductStacks.toArray(new ItemStack[0]), null, null, @@ -149,7 +151,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.removeFurnaceSmelting(aOreStack); } else { tHasSmelting = GT_ModHandler.addSmeltingRecipe( - aOreStack, GT_Utility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto)); + aOreStack, + GT_Utility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto)); } if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_TRIPLE)) { @@ -160,8 +163,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -171,8 +174,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -185,8 +188,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -196,8 +199,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -216,7 +219,10 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra if (tCrushed != null) { GT_Values.RA.addForgeHammerRecipe( - aOreStack, GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed), 16, 10); + aOreStack, + GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed), + 16, + 10); GT_ModHandler.addPulverisationRecipe( aOreStack, GT_Utility.mul(2L, tCrushed), @@ -235,8 +241,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra tPrimaryByMaterial, GT_Utility.copyAmount(1L, tPrimaryByProduct), 1L), - tPrimaryByProduct == null - ? 0 + tPrimaryByProduct == null ? 0 : tPrimaryByProduct.stackSize * 10 * aMultiplier * aMaterial.mByProductMultiplier, GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial), 50, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java index c6be18cd1f..11c7fb0a3c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java @@ -1,14 +1,16 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingOrePoor() { OrePrefixes.orePoor.add(this); OrePrefixes.oreSmall.add(this); @@ -17,8 +19,8 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { int aMultiplier = 1; switch (aPrefix) { case oreSmall: @@ -52,10 +54,9 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial), 100, true); - if (aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) - GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier)); + if (aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) GT_ModHandler.addSmeltingRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier)); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java index ce1bedac21..55f1e6265a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -1,31 +1,27 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.GT_Mod; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipeRegistrator { - private final OrePrefixes[] mSmeltingPrefixes = { - OrePrefixes.crushed, - OrePrefixes.crushedPurified, - OrePrefixes.crushedCentrifuged, - OrePrefixes.dust, - OrePrefixes.dustImpure, - OrePrefixes.dustPure, - OrePrefixes.dustRefined - }; + + private final OrePrefixes[] mSmeltingPrefixes = { OrePrefixes.crushed, OrePrefixes.crushedPurified, + OrePrefixes.crushedCentrifuged, OrePrefixes.dust, OrePrefixes.dustImpure, OrePrefixes.dustPure, + OrePrefixes.dustRefined }; public ProcessingOreSmelting() { for (OrePrefixes tPrefix : this.mSmeltingPrefixes) tPrefix.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_ModHandler.removeFurnaceSmelting(aStack); if (!aMaterial.contains(SubTag.NO_SMELTING)) { if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { @@ -36,13 +32,11 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe ItemList.Circuit_Integrated.getWithDamage(0L, 1L), null, null, - aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, - aMaterial, - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - 1L) - : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + aMaterial, + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), null, (int) Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp, 120, @@ -162,11 +156,10 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe break; } ItemStack tStack = GT_OreDictUnificator.get(outputPrefix, aMaterial.mDirectSmelting, outputSize); - if (tStack == null) - tStack = GT_OreDictUnificator.get( - aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, - aMaterial.mDirectSmelting, - 1L); + if (tStack == null) tStack = GT_OreDictUnificator.get( + aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, + aMaterial.mDirectSmelting, + 1L); if ((tStack == null) && (!aMaterial.contains(SubTag.SMELTING_TO_GEM))) tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); GT_ModHandler.addSmeltingRecipe(aStack, tStack); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java index 62b623a8b1..45ecc36230 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java @@ -3,13 +3,15 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingPipe() { OrePrefixes.pipeHuge.add(this); OrePrefixes.pipeLarge.add(this); @@ -26,8 +28,8 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aPrefix) { case pipeHuge: case pipeLarge: @@ -39,71 +41,44 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"PPP", "h w", "PPP", 'P', OrePrefixes.plate.get(aMaterial)}); + new Object[] { "PPP", "h w", "PPP", 'P', OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 6L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PWP", - "P P", - "PHP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench - }); + new Object[] { "PWP", "P P", "PHP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 2L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PPP", - "W H", - "PPP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench - }); + new Object[] { "PPP", "W H", "PPP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - "P P", - "PWP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench - }); + new Object[] { "PHP", "P P", "PWP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial)}); + new Object[] { "DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial) }); } break; case pipeRestrictiveHuge: @@ -127,9 +102,8 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1), GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "MM ", "MM ", " ", 'M', GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) - }); + new Object[] { "MM ", "MM ", " ", 'M', + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) }); } RA.addAssemblerRecipe( @@ -145,14 +119,8 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount(1, aStack), GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PPP", - "PPP", - "PPP", - 'P', - GT_OreDictUnificator.get( - aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) - }); + new Object[] { "PPP", "PPP", "PPP", 'P', GT_OreDictUnificator + .get(aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) }); } RA.addAssemblerRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java index 56b30c5486..921491237a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java @@ -1,5 +1,9 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -7,18 +11,16 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingPlank() { OrePrefixes.plank.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aOreDictName.startsWith("plankWood")) { GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), @@ -120,7 +122,7 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"sP", 'P', tStack}); + new Object[] { "sP", 'P', tStack }); } if ((tStack == null) && (i >= 16)) break; } @@ -139,7 +141,7 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"sP", 'P', aStack}); + new Object[] { "sP", 'P', aStack }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 7be8375605..73410bb80b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -10,6 +10,11 @@ import static gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLIS import static gregtech.api.util.GT_Utility.calculateRecipeEU; import static gregtech.common.GT_Proxy.tBits; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.render.TextureFactory; @@ -17,12 +22,9 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_RecipeRegistrator; import gregtech.api.util.GT_Utility; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingPlate() { OrePrefixes.plate.add(this); OrePrefixes.plateDouble.add(this); @@ -45,8 +47,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist * @param aStack always != null, the {@link ItemStack} to register */ @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { final boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); final boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); @@ -112,14 +114,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] {"hX", 'X', OrePrefixes.plate.get(aMaterial)}); + new Object[] { "hX", 'X', OrePrefixes.plate.get(aMaterial) }); if (aMaterial == Materials.Paper) { GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount(GregTech_API.sRecipeFile.get(harderrecipes, aStack, true) ? 2L : 3L, aStack), BUFFERED, - new Object[] {"XXX", 'X', new ItemStack(Items.reeds, 1, W)}); + new Object[] { "XXX", 'X', new ItemStack(Items.reeds, 1, W) }); } if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial) { @@ -131,49 +133,30 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "h", // craftingToolHardHammer - "X", - "X", - 'X', - OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "h", // craftingToolHardHammer + "X", "X", 'X', OrePrefixes.ingot.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false GT_ModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "H", // craftingToolForgeHammer - "X", - 'H', - ToolDictNames.craftingToolForgeHammer, - 'X', - OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "H", // craftingToolForgeHammer + "X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', + OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "h", // craftingToolHardHammer - "X", - 'X', - OrePrefixes.gem.get(aMaterial) - }); + new Object[] { "h", // craftingToolHardHammer + "X", 'X', OrePrefixes.gem.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false GT_ModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "H", // craftingToolForgeHammer - "X", - 'H', - ToolDictNames.craftingToolForgeHammer, - 'X', - OrePrefixes.gem.get(aMaterial) - }); + new Object[] { "H", // craftingToolForgeHammer + "X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', + OrePrefixes.gem.get(aMaterial) }); } } @@ -184,14 +167,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addShapelessCraftingRecipe( aMaterial.getDust(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] {ToolDictNames.craftingToolMortar, OrePrefixes.plate.get(aMaterial)}); + new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.plate.get(aMaterial) }); } } } } - private void registerPlateDouble( - final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, final long aMaterialMass) { + private void registerPlateDouble(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -214,24 +197,19 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - aPlateStack, - 'B', - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', aPlateStack, 'B', aPlateStack }); } // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false - // GT_ModHandler.addShapelessCraftingRecipe( - // GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new + // GT_ModHandler.addShapelessCraftingRecipe( + // GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new // Object[] { - // gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, + // gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, // aPlateStack - // }); + // }); } RA.addBenderRecipe( @@ -252,8 +230,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } } - private void registerPlateTriple( - final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, final long aMaterialMass) { + private void registerPlateTriple(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -277,23 +255,16 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist Object aPlateStack = OrePrefixes.plate.get(aMaterial); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - OrePrefixes.plateDouble.get(aMaterial), - 'B', - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateDouble.get(aMaterial), 'B', aPlateStack }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, - aPlateStack, - aPlateStack, - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, + aPlateStack, aPlateStack }); } } @@ -321,23 +292,18 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); } - private void registerPlateQuadruple( - final Materials aMaterial, - final ItemStack aStack, - final boolean aNoSmashing, - final long aMaterialMass, - final boolean aNoWorking) { + private void registerPlateQuadruple(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, + final long aMaterialMass, final boolean aNoWorking) { registerCover(aMaterial, aStack); GT_ModHandler.removeRecipeByOutputDelayed(aStack); - if (!aNoWorking) - RA.addCNCRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - (int) Math.max(aMaterialMass * 2L, 1L), - 30); + if (!aNoWorking) RA.addCNCRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + (int) Math.max(aMaterialMass * 2L, 1L), + 30); if (!aNoSmashing) { @@ -350,24 +316,16 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist Object aPlateStack = OrePrefixes.plate.get(aMaterial); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - OrePrefixes.plateTriple.get(aMaterial), - 'B', - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateTriple.get(aMaterial), 'B', aPlateStack }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, - aPlateStack, - aPlateStack, - aPlateStack, - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, + aPlateStack, aPlateStack, aPlateStack }); } } @@ -389,8 +347,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } } - private void registerPlateQuintuple( - final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, final long aMaterialMass) { + private void registerPlateQuintuple(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -407,25 +365,16 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist Object aPlateStack = OrePrefixes.plate.get(aMaterial); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - OrePrefixes.plateQuadruple.get(aMaterial), - 'B', - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateQuadruple.get(aMaterial), 'B', aPlateStack }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - ToolDictNames.craftingToolForgeHammer, - aPlateStack, - aPlateStack, - aPlateStack, - aPlateStack, - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, aPlateStack, + aPlateStack, aPlateStack }); } } @@ -447,8 +396,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } } - private void registerPlateDense( - final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, final long aMaterialMass) { + private void registerPlateDense(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -464,8 +413,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } } - private void registerItemCasing( - final OrePrefixes aPrefix, final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing) { + private void registerItemCasing(final OrePrefixes aPrefix, final Materials aMaterial, final ItemStack aStack, + final boolean aNoSmashing) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); @@ -479,8 +428,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist calculateRecipeEU(aMaterial, 8)); } - if (aMaterial.mUnificatable - && aMaterial.mMaterialInto == aMaterial + if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial && !aNoSmashing && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { @@ -488,15 +436,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] {"h X", 'X', OrePrefixes.plate.get(aMaterial)}); + new Object[] { "h X", 'X', OrePrefixes.plate.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "H X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', OrePrefixes.plate.get(aMaterial) - }); + new Object[] { "H X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', + OrePrefixes.plate.get(aMaterial) }); } } @@ -589,8 +536,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist // Get ItemStack of Block matching Materials ItemStack tStack = NI; // Try different prefixes to use same smooth stones as older GT5U - for (OrePrefixes orePrefix : - new OrePrefixes[] {OrePrefixes.block, OrePrefixes.block_, OrePrefixes.stoneSmooth, OrePrefixes.stone}) { + for (OrePrefixes orePrefix : new OrePrefixes[] { OrePrefixes.block, OrePrefixes.block_, OrePrefixes.stoneSmooth, + OrePrefixes.stone }) { if ((tStack = GT_OreDictUnificator.get(orePrefix, aMaterial, 1)) != NI) break; } @@ -598,14 +545,10 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GregTech_API.registerCover( aStack, // If there is an ItemStack of Block for Materials - tStack == NI - ? - // Use Materials mRGBa dyed blocs/materialicons/MATERIALSET/block1 icons - TextureFactory.builder() - .addIcon(aMaterial.mIconSet.mTextures[TextureSet.INDEX_block1]) - .setRGBA(aMaterial.mRGBa) - .stdOrient() - .build() + tStack == NI ? + // Use Materials mRGBa dyed blocs/materialicons/MATERIALSET/block1 icons + TextureFactory.builder().addIcon(aMaterial.mIconSet.mTextures[TextureSet.INDEX_block1]) + .setRGBA(aMaterial.mRGBa).stdOrient().build() : // or copy Block texture TextureFactory.of(Block.getBlockFromItem(tStack.getItem()), tStack.getItemDamage()), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java index dfda2cd0f3..25c2810a94 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java @@ -1,14 +1,16 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingPure() { OrePrefixes.crushedPurified.add(this); OrePrefixes.cleanGravel.add(this); @@ -16,8 +18,8 @@ public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistr } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java index 69957bd909..3f06f0676d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java @@ -1,14 +1,16 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingRecycling implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingRecycling() { for (OrePrefixes tPrefix : OrePrefixes.values()) if ((tPrefix.mIsMaterialBased) && (tPrefix.mMaterialAmount > 0L) && (tPrefix.mIsContainer)) @@ -16,10 +18,9 @@ public class ProcessingRecycling implements gregtech.api.interfaces.IOreRecipeRe } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if ((aMaterial != Materials.Empty) - && (GT_Utility.getFluidForFilledItem(aStack, true) == null) + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + if ((aMaterial != Materials.Empty) && (GT_Utility.getFluidForFilledItem(aStack, true) == null) && !aMaterial.contains(SubTag.SMELTING_TO_FLUID)) GT_Values.RA.addCannerRecipe( aStack, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java index f150c073fa..6f05d874e0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java @@ -2,23 +2,24 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingRotor() { OrePrefixes.rotor.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { ItemStack tPlate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L); ItemStack tRing = GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L); @@ -27,37 +28,30 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), GT_Proxy.tBits, new Object[] { - "PhP", - "SRf", - "PdP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'R', - OrePrefixes.ring.get(aMaterial), - 'S', - OrePrefixes.screw.get(aMaterial) - }); + GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PhP", "SRf", "PdP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)}, + new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, Materials.Tin.getMolten(32), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), (int) Math.max(aMaterial.getMass(), 1L), calculateRecipeEU(aMaterial, 24)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)}, + new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, Materials.Lead.getMolten(48), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), (int) Math.max(aMaterial.getMass(), 1L), calculateRecipeEU(aMaterial, 24)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)}, + new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, Materials.SolderingAlloy.getMolten(16), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), (int) Math.max(aMaterial.getMass(), 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java index c621450e80..fd9ab7dbad 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import appeng.core.Api; import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; @@ -10,16 +12,16 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingRound() { OrePrefixes.round.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (!aMaterial.contains(SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe( GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L), @@ -31,17 +33,15 @@ public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"fX", "Xh", 'X', OrePrefixes.nugget.get(aMaterial)}); + new Object[] { "fX", "Xh", 'X', OrePrefixes.nugget.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 4L), GT_Proxy.tBits, - new Object[] {"fXh", 'X', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "fXh", 'X', OrePrefixes.ingot.get(aMaterial) }); } } if (GT_Mod.gregtechproxy.mAE2Integration) { - Api.INSTANCE - .registries() - .matterCannon() + Api.INSTANCE.registries().matterCannon() .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass()); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java index 53887e2788..2e91eef9f5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java @@ -1,21 +1,23 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingSand implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingSand() { OrePrefixes.sand.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aOreDictName.equals("sandOil")) { GT_Values.RA.addCentrifugeRecipe( GT_Utility.copyAmount(2L, aStack), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java index 4e65e501b3..5ce42c6f45 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -7,20 +9,20 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingSaplings implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingSaplings() { OrePrefixes.treeSapling.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addPulveriserRecipe( GT_Utility.copyAmount(1L, aStack), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L) }, + new int[] { 10000 }, 100, 2); GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(8L, aStack), ItemList.IC2_Plantball.get(1L)); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java index 4682394199..65564437e4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java @@ -2,21 +2,23 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingScrew() { OrePrefixes.screw.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (!aMaterial.contains(SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe( GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), @@ -29,7 +31,7 @@ public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"fX", "X ", 'X', OrePrefixes.bolt.get(aMaterial)}); + new Object[] { "fX", "X ", 'X', OrePrefixes.bolt.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index b131b9273c..3afc8201c6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -2,24 +2,26 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingShaping() { OrePrefixes.ingot.add(this); OrePrefixes.dust.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (((aMaterial == Materials.Glass) || (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null)) && (!aMaterial.contains(SubTag.NO_SMELTING))) { long aMaterialMass = aMaterial.getMass(); @@ -207,20 +209,18 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); } } - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Wire.get(0L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); - if (tAmount * 8 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Bolt.get(0L), - GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Wire.get(0L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); + if (tAmount * 8 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Bolt.get(0L), + GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); if (tAmount * 4 <= 64) { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), @@ -228,8 +228,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, tAmount * 4), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_SMASHING)) // If material tier < IV then add manual recipe. @@ -237,7 +236,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"h ", "fX", 'X', OrePrefixes.stick.get(aMaterial)}); + new Object[] { "h ", "fX", 'X', OrePrefixes.stick.get(aMaterial) }); } } @@ -349,20 +348,18 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi ItemList.Cell_Empty.get(tAmount), tAmount * 128, 30); - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingadviron", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingadviron", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingadviron", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingadviron", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Iron": case "WroughtIron": @@ -372,27 +369,24 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("fuelRod", tAmount), tAmount * 128, 30); - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingiron", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingiron", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); - if (tAmount * 31 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(31L, aStack), - ItemList.Shape_Mold_Anvil.get(0L), - new ItemStack(Blocks.anvil, 1, 0), - tAmount * 512, - 4 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingiron", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingiron", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); + if (tAmount * 31 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(31L, aStack), + ItemList.Shape_Mold_Anvil.get(0L), + new ItemStack(Blocks.anvil, 1, 0), + tAmount * 512, + 4 * tVoltageMultiplier); break; case "Tin": GT_Values.RA.addExtruderRecipe( @@ -401,85 +395,75 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi ItemList.Cell_Empty.get(tAmount), tAmount * 128, 30); - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingtin", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingtin", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingtin", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingtin", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Lead": - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casinglead", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casinglead", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casinglead", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casinglead", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Copper": case "AnnealedCopper": - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingcopper", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingcopper", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingcopper", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingcopper", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Bronze": - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingbronze", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingbronze", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingbronze", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingbronze", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Gold": - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casinggold", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casinggold", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casinggold", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casinggold", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Polytetrafluoroethylene": // Recipe for cells from PTFE, why is it here? GT_Values.RA.addExtruderRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java index 29a990aedc..1b7440b2af 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java @@ -2,22 +2,24 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.enums.GT_Values.MOD_ID_RC; +import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingSlab implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingSlab() { OrePrefixes.slab.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aOreDictName.startsWith("slabWood")) { if (Loader.isModLoaded(MOD_ID_RC)) { GT_Values.RA.addChemicalBathRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java index 69d7366c83..3e7470b5f7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java @@ -2,31 +2,32 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingStick() { OrePrefixes.stick.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {" s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial)}); + new Object[] { " s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial) }); } if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe( - aMaterial.contains(SubTag.CRYSTAL) - ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) + aMaterial.contains(SubTag.CRYSTAL) ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L), @@ -43,11 +44,11 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"s", "X", 'X', OrePrefixes.stickLong.get(aMaterial)}); + new Object[] { "s", "X", 'X', OrePrefixes.stickLong.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"f ", " X", 'X', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "f ", " X", 'X', OrePrefixes.ingot.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java index 0558310751..e586922891 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java @@ -2,26 +2,28 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingStickLong() { OrePrefixes.stickLong.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {" s ", "fSx", " S ", 'S', OrePrefixes.stickLong.get(aMaterial)}); + new Object[] { " s ", "fSx", " S ", 'S', OrePrefixes.stickLong.get(aMaterial) }); } if (!aMaterial.contains(SubTag.NO_WORKING)) { GT_Values.RA.addCutterRecipe( @@ -35,11 +37,11 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"sf", "G ", 'G', OrePrefixes.gemFlawless.get(aMaterial)}); + new Object[] { "sf", "G ", 'G', OrePrefixes.gemFlawless.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"sf", "G ", 'G', OrePrefixes.gemExquisite.get(aMaterial)}); + new Object[] { "sf", "G ", 'G', OrePrefixes.gemExquisite.get(aMaterial) }); } } } @@ -54,7 +56,7 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"ShS", 'S', OrePrefixes.stick.get(aMaterial)}); + new Object[] { "ShS", 'S', OrePrefixes.stick.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java index fcd604ef3b..72239056cd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java @@ -1,5 +1,10 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -8,19 +13,16 @@ import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingStone implements IOreRecipeRegistrator { + public ProcessingStone() { OrePrefixes.stone.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { Block aBlock = GT_Utility.getBlockFromStack(aStack); switch (aMaterial.mName) { case "NULL": @@ -34,7 +36,11 @@ public class ProcessingStone implements IOreRecipeRegistrator { break; case "Sand": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), new ItemStack(Blocks.sand, 1, 0), null, 10, false); + GT_Utility.copyAmount(1L, aStack), + new ItemStack(Blocks.sand, 1, 0), + null, + 10, + false); break; case "Endstone": GT_ModHandler.addPulverisationRecipe( @@ -87,7 +93,8 @@ public class ProcessingStone implements IOreRecipeRegistrator { 100, 30); GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)); break; case "Rhyolite": GT_ModHandler.addPulverisationRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java index 4e78aaf72f..fad83fe171 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java @@ -1,23 +1,25 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingStoneCobble implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingStoneCobble() { OrePrefixes.stoneCobble.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addAssemblerRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java index 539e0513e0..1bab13c5b5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java @@ -1,13 +1,15 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingStoneVarious implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingStoneVarious() { OrePrefixes.stone.add(this); OrePrefixes.stoneCobble.add(this); @@ -20,12 +22,8 @@ public class ProcessingStoneVarious implements gregtech.api.interfaces.IOreRecip } @Override - public void registerOre( - OrePrefixes aPrefix, - gregtech.api.enums.Materials aMaterial, - String aOreDictName, - String aModName, - ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, gregtech.api.enums.Materials aMaterial, String aOreDictName, + String aModName, ItemStack aStack) { if (aPrefix == OrePrefixes.stoneSmooth) { GT_Values.RA.addAssemblerRecipe( GT_Utility.copyAmount(1L, aStack), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index 25ebbe793c..31260c1308 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -2,16 +2,18 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; import gregtech.common.items.GT_MetaGenerated_Tool_01; -import net.minecraft.item.ItemStack; -public class ProcessingToolHead - implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH OLD TOOL HEAD??? generator +public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH OLD TOOL + // HEAD??? generator + public ProcessingToolHead() { OrePrefixes.toolHeadArrow.add(this); OrePrefixes.toolHeadAxe.add(this); @@ -33,13 +35,11 @@ public class ProcessingToolHead } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - boolean aSpecialRecipeReq1 = aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + boolean aSpecialRecipeReq1 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_SMASHING); - boolean aSpecialRecipeReq2 = aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING); boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); switch (aPrefix) { @@ -57,858 +57,489 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"Xf", 'X', OrePrefixes.gemChipped.get(aMaterial)}); + new Object[] { "Xf", 'X', OrePrefixes.gemChipped.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 3L), GT_Proxy.tBits, - new Object[] { - (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", - 'P', - OrePrefixes.plate.get(aMaterial) - }); + new Object[] { (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", 'P', + OrePrefixes.plate.get(aMaterial) }); } break; case toolHeadAxe: GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.AXE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.AXE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(2) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.AXE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.AXE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, 120); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PIh", - "P ", - "f ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GG ", "G ", "f ", 'G', OrePrefixes.gem.get(aMaterial)}); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PIh", "P ", "f ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GG ", "G ", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); break; case toolHeadBuzzSaw: GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 100000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 75000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 50000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.BUZZSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1600000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.BUZZSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1200000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.BUZZSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {800000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"wXh", "X X", "fXx", 'X', OrePrefixes.plate.get(aMaterial)}); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "wXh", "X X", "fXx", 'X', OrePrefixes.plate.get(aMaterial) }); break; case toolHeadChainsaw: GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 100000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 75000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 50000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.CHAINSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1600000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.CHAINSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1200000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.CHAINSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {800000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "SRS", - "XhX", - "SRS", - 'X', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.plate.get(Materials.Steel), - 'R', - OrePrefixes.ring.get(Materials.Steel) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "SRS", "XhX", "SRS", 'X', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel) }); break; case toolHeadDrill: GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, 1, aMaterial, Materials.Steel, new long[] { - 100_000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100_000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, 1, aMaterial, Materials.Steel, new long[] { - 75_000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75_000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, 1, aMaterial, Materials.Steel, new long[] { - 50_000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50_000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400_000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400_000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300_000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300_000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200_000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200_000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 1_600_000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1_600_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 1_200_000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1_200_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 800_000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 800_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.JACKHAMMER, 1, aMaterial, Materials.StainlessSteel, - new long[] {1_600_000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1_600_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "PRP", - "MPB", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Piston_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'R', - OrePrefixes.spring.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Piston_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'R', + OrePrefixes.spring.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.JACKHAMMER, 1, aMaterial, Materials.StainlessSteel, - new long[] {1_200_000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1_200_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "PRP", - "MPB", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Piston_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'R', - OrePrefixes.spring.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Piston_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'R', + OrePrefixes.spring.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.JACKHAMMER, 1, aMaterial, Materials.StainlessSteel, - new long[] {800_000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 800_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "PRP", - "MPB", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Piston_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'R', - OrePrefixes.spring.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); + new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Piston_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'R', + OrePrefixes.spring.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); if (aSpecialRecipeReq2) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "XSX", - "XSX", - "ShS", - 'X', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.plate.get(Materials.Steel) - }); + new Object[] { "XSX", "XSX", "ShS", 'X', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.plate.get(Materials.Steel) }); if (aMaterial.getMolten(1) != null) { GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_ToolHeadDrill.get(0), @@ -931,8 +562,12 @@ public class ProcessingToolHead if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.FILE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if ((!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.BOUNCY))) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -946,28 +581,23 @@ public class ProcessingToolHead GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "P", - "P", - "S", - 'P', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) - }); + new Object[] { "P", "P", "S", 'P', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } } } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(15) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(15) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.FILE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); @@ -976,75 +606,71 @@ public class ProcessingToolHead if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HOE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.HOE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(16) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(16) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HOE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.HOE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PIh", - "f ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GG ", "f ", " ", 'G', OrePrefixes.gem.get(aMaterial)}); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PIh", "f ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GG ", "f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); break; case toolHeadPickaxe: if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PICKAXE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.PICKAXE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PII", - "f h", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PII", "f h", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial)}); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(5) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PICKAXE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.PICKAXE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, 120); @@ -1054,31 +680,35 @@ public class ProcessingToolHead GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLOW, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.PLOW, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"PP", "PP", "hf", 'P', OrePrefixes.plate.get(aMaterial)}); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PP", "PP", "hf", 'P', OrePrefixes.plate.get(aMaterial) }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial)}); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(6) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLOW, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.PLOW, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); @@ -1088,38 +718,36 @@ public class ProcessingToolHead GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.SAW, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PP ", - "fh ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PP ", "fh ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GGf", 'G', OrePrefixes.gem.get(aMaterial)}); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GGf", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(7) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.SAW, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); @@ -1129,38 +757,36 @@ public class ProcessingToolHead GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SENSE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.SENSE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PPI", - "hf ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PPI", "hf ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial)}); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(8) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(8) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SENSE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.SENSE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); @@ -1168,583 +794,371 @@ public class ProcessingToolHead case toolHeadShovel: GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SHOVEL, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.SHOVEL, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(9) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SHOVEL, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.SHOVEL, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, 120); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) - }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"fG", 'G', OrePrefixes.gem.get(aMaterial)}); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fG", 'G', OrePrefixes.gem.get(aMaterial) }); break; case toolHeadSword: if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SWORD, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.SWORD, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - " P ", - "fPh", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { " P ", "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {" G", "fG", 'G', OrePrefixes.gem.get(aMaterial)}); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { " G", "fG", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(10) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(10) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SWORD, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.SWORD, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); break; case toolHeadUniversalSpade: GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, aMaterial, aMaterial, null), - new Object[] { - aOreDictName, - OrePrefixes.stick.get(aMaterial), - OrePrefixes.screw.get(aMaterial), - ToolDictNames.craftingToolScrewdriver - }); + GT_MetaGenerated_Tool_01.UNIVERSALSPADE, + 1, + aMaterial, + aMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial), OrePrefixes.screw.get(aMaterial), + ToolDictNames.craftingToolScrewdriver }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(11) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(11) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.UNIVERSALSPADE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, 120); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"fX", 'X', OrePrefixes.toolHeadShovel.get(aMaterial)}); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fX", 'X', OrePrefixes.toolHeadShovel.get(aMaterial) }); break; case toolHeadWrench: GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, 1, aMaterial, Materials.Steel, new long[] { - 100000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, 1, aMaterial, Materials.Steel, new long[] { - 75000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, 1, aMaterial, Materials.Steel, new long[] { - 50000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 1600000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 1200000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 800000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, 1, aMaterial, Materials.Steel, new long[] { - 100000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, 1, aMaterial, Materials.Steel, new long[] { - 75000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, 1, aMaterial, Materials.Steel, new long[] { - 50000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), + 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), + 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), + 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1600000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1200000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {800000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "hXW", - "XRX", - "WXd", - 'X', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.plate.get(Materials.Steel), - 'R', - OrePrefixes.ring.get(Materials.Steel), - 'W', - OrePrefixes.screw.get(Materials.Steel) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "hXW", "XRX", "WXd", 'X', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel), 'W', + OrePrefixes.screw.get(Materials.Steel) }); break; case toolHeadHammer: case toolHeadMallet: GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(14) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(14) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) @@ -1767,7 +1181,7 @@ public class ProcessingToolHead aMaterial.mHandleMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) @@ -1778,17 +1192,10 @@ public class ProcessingToolHead aMaterial.mHandleMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "XX ", - "XXS", - "XX ", - 'X', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(Materials.Wood) - : OrePrefixes.ingot.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) - }); + new Object[] { "XX ", "XXS", "XX ", 'X', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood) + : OrePrefixes.ingot.get(aMaterial), + 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) @@ -1799,32 +1206,16 @@ public class ProcessingToolHead aMaterial.mHandleMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "XX ", - "XXS", - "XX ", - 'X', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(Materials.Wood) - : OrePrefixes.gem.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) - }); + new Object[] { "XX ", "XXS", "XX ", 'X', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood) + : OrePrefixes.gem.get(aMaterial), + 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } - if (aPrefix == OrePrefixes.toolHeadHammer) - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "II ", - "IIh", - "II ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); + if (aPrefix == OrePrefixes.toolHeadHammer) if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "II ", "IIh", "II ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); break; case turbineBlade: GT_Values.RA.addAssemblerRecipe( @@ -1857,19 +1248,10 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "fPd", - "SPS", - " P ", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plateDouble.get(aMaterial), - 'R', - OrePrefixes.ring.get(aMaterial), - 'S', - OrePrefixes.screw.get(aMaterial) - }); + new Object[] { "fPd", "SPS", " P ", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plateDouble.get(aMaterial), + 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial) }); } GT_Values.RA.addFormingPressRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java index d50fa96967..59a9e6a479 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java @@ -1,206 +1,132 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.common.items.GT_MetaGenerated_Tool_01; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingToolOther() { OrePrefixes.toolHeadHammer.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { if (aMaterial != Materials.Rubber) { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLUNGER, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.PLUNGER, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "xRR", - " SR", - "S f", - 'S', - OrePrefixes.stick.get(aMaterial), - 'R', - OrePrefixes.plate.get(Materials.AnyRubber) - }); + new Object[] { "xRR", " SR", "S f", 'S', OrePrefixes.stick.get(aMaterial), 'R', + OrePrefixes.plate.get(Materials.AnyRubber) }); } - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CROWBAR, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue}); + new Object[] { "hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.SCREWDRIVER, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - " fS", - " Sh", - "W ", - 'S', - OrePrefixes.stick.get(aMaterial), - 'W', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) - }); + new Object[] { " fS", " Sh", "W ", 'S', OrePrefixes.stick.get(aMaterial), 'W', + OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PfP", - "hPd", - "STS", - 'S', - OrePrefixes.stick.get(aMaterial), - 'P', - OrePrefixes.plate.get(aMaterial), - 'T', - OrePrefixes.screw.get(aMaterial) - }); + new Object[] { "PfP", "hPd", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCOOP, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.SCOOP, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SWS", - "SSS", - "xSh", - 'S', - OrePrefixes.stick.get(aMaterial), - 'W', - new ItemStack(Blocks.wool, 1, 32767) - }); + new Object[] { "SWS", "SSS", "xSh", 'S', OrePrefixes.stick.get(aMaterial), 'W', + new ItemStack(Blocks.wool, 1, 32767) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BRANCHCUTTER, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.BRANCHCUTTER, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PfP", - "PdP", - "STS", - 'S', - OrePrefixes.stick.get(aMaterial), - 'P', - OrePrefixes.plate.get(aMaterial), - 'T', - OrePrefixes.screw.get(aMaterial) - }); + new Object[] { "PfP", "PdP", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.KNIFE, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.KNIFE, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial) - }); + new Object[] { "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, + 1, + aMaterial, + aMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PPf", - "PP ", - "Sh ", - 'S', - OrePrefixes.stick.get(aMaterial), - 'P', - OrePrefixes.plate.get(aMaterial) - }); + new Object[] { "PPf", "PP ", "Sh ", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, aMaterial, Materials.Rubber, new long[] { - 100000L, 32L, 1L, -1L - }), + GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, + 1, + aMaterial, + Materials.Rubber, + new long[] { 100000L, 32L, 1L, -1L }), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "LBf", - "Sd ", - "P ", - 'B', - OrePrefixes.bolt.get(aMaterial), - 'P', - OrePrefixes.plate.get(Materials.AnyRubber), - 'S', - OrePrefixes.stick.get(Materials.Iron), - 'L', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', + OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Iron), + 'L', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_MV, 1, aMaterial, Materials.Rubber, new long[] { - 400000L, 128L, 2L, -1L - }), + GT_MetaGenerated_Tool_01.SOLDERING_IRON_MV, + 1, + aMaterial, + Materials.Rubber, + new long[] { 400000L, 128L, 2L, -1L }), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "LBf", - "Sd ", - "P ", - 'B', - OrePrefixes.bolt.get(aMaterial), - 'P', - OrePrefixes.plate.get(Materials.AnyRubber), - 'S', - OrePrefixes.stick.get(Materials.Steel), - 'L', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', + OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Steel), + 'L', ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SOLDERING_IRON_HV, 1, aMaterial, Materials.AnySyntheticRubber, - new long[] {1600000L, 512L, 3L, -1L}), + new long[] { 1600000L, 512L, 3L, -1L }), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "LBf", - "Sd ", - "P ", - 'B', - OrePrefixes.bolt.get(aMaterial), - 'P', - OrePrefixes.plate.get(Materials.AnySyntheticRubber), - 'S', - OrePrefixes.stick.get(Materials.StainlessSteel), - 'L', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', + OrePrefixes.plate.get(Materials.AnySyntheticRubber), 'S', + OrePrefixes.stick.get(Materials.StainlessSteel), 'L', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( (GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.POCKET_MULTITOOL, 1, aMaterial, aMaterial, null)), + GT_MetaGenerated_Tool_01.POCKET_MULTITOOL, + 1, + aMaterial, + aMaterial, + null)), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "ABC", - "DEF", - "CFG", - 'A', - OrePrefixes.stickLong.get(aMaterial), - 'B', - OrePrefixes.toolHeadSaw.get(aMaterial), - 'C', - OrePrefixes.ring.get(aMaterial), - 'D', - OrePrefixes.toolHeadFile.get(aMaterial), - 'E', - OrePrefixes.plate.get(aMaterial), - 'F', - OrePrefixes.toolHeadSword.get(aMaterial), - 'G', - Dyes.dyeBlue - }); + new Object[] { "ABC", "DEF", "CFG", 'A', OrePrefixes.stickLong.get(aMaterial), 'B', + OrePrefixes.toolHeadSaw.get(aMaterial), 'C', OrePrefixes.ring.get(aMaterial), 'D', + OrePrefixes.toolHeadFile.get(aMaterial), 'E', OrePrefixes.plate.get(aMaterial), 'F', + OrePrefixes.toolHeadSword.get(aMaterial), 'G', Dyes.dyeBlue }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java index 217781f61a..1d0fa1c3bb 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java @@ -1,30 +1,33 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingTransforming implements IOreRecipeRegistrator { + public ProcessingTransforming() { for (OrePrefixes tPrefix : OrePrefixes.values()) if (((tPrefix.mMaterialAmount > 0L) && (!tPrefix.mIsContainer) && (!tPrefix.mIsEnchantable)) - || (tPrefix == OrePrefixes.plank)) tPrefix.add(this); + || (tPrefix == OrePrefixes.plank)) + tPrefix.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aPrefix == OrePrefixes.plank) aPrefix = OrePrefixes.plate; switch (aMaterial.mName) { case "Wood": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.SeedOil.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)), + Materials.SeedOil + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)), GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), GT_Values.NI, GT_Values.NI, @@ -33,8 +36,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { 8); GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.SeedOilLin.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), + Materials.SeedOilLin + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), GT_Values.NI, GT_Values.NI, @@ -43,8 +46,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { 8); GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.SeedOilHemp.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), + Materials.SeedOilHemp + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), GT_Values.NI, GT_Values.NI, @@ -55,8 +58,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Iron": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)), + Materials.FierySteel + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)), GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), GT_Values.NI, GT_Values.NI, @@ -72,8 +75,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "WroughtIron": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)), + Materials.FierySteel + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)), GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), GT_Values.NI, GT_Values.NI, @@ -89,8 +92,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Steel": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)), + Materials.FierySteel + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)), GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), GT_Values.NI, GT_Values.NI, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java index 315e8a7549..6b6580885e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java @@ -1,19 +1,21 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingWax implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingWax() { OrePrefixes.wax.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aOreDictName.equals("waxMagical")) GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aStack), null, 6, 5); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index ae1b476b94..9b136ad29b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -2,6 +2,10 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; + import appeng.api.config.TunnelType; import appeng.core.Api; import cpw.mods.fml.common.Optional; @@ -12,14 +16,12 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistrator { - private Materials[] dielectrics = {Materials.PolyvinylChloride, Materials.Polydimethylsiloxane}; - private Materials[] rubbers = {Materials.Rubber, Materials.StyreneButadieneRubber, Materials.Silicone}; - private Materials[] syntheticRubbers = {Materials.StyreneButadieneRubber, Materials.Silicone}; + private Materials[] dielectrics = { Materials.PolyvinylChloride, Materials.Polydimethylsiloxane }; + private Materials[] rubbers = { Materials.Rubber, Materials.StyreneButadieneRubber, Materials.Silicone }; + private Materials[] syntheticRubbers = { Materials.StyreneButadieneRubber, Materials.Silicone }; private static Object tt; @@ -33,8 +35,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (GT_Mod.gregtechproxy.mAE2Integration) { if (tt == TunnelType.ME) { try { @@ -64,14 +66,13 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr 200, calculateRecipeEU(aMaterial, 8)); } - if (aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"Xx", 'X', OrePrefixes.plate.get(aMaterial)}); + new Object[] { "Xx", 'X', OrePrefixes.plate.get(aMaterial) }); } } GT_Values.RA.addAssemblerRecipe( @@ -110,10 +111,11 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr correspondingCable = OrePrefixes.cableGt02; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), new Object[] {aOreDictName}); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); } break; case wireGt04: @@ -121,16 +123,15 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr correspondingCable = OrePrefixes.cableGt04; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), new Object[] {aOreDictName}); - GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, aStack), new Object[] { - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial) - }); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial) }); } break; case wireGt08: @@ -138,20 +139,17 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr correspondingCable = OrePrefixes.cableGt08; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), new Object[] {aOreDictName}); - GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, aStack), new Object[] { - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial) - }); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } break; case wireGt12: @@ -160,10 +158,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L), - new Object[] {aOreDictName}); + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } break; case wireGt16: @@ -173,13 +171,13 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L), - new Object[] {aOreDictName}); + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt08.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt08.get(aMaterial) }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); if (GT_Mod.gregtechproxy.mAE2Integration) { AE2addNewAttunement(aStack); @@ -187,8 +185,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } break; default: - GT_Log.err.println("OrePrefix " + aPrefix.name() + " cannot be registered as a cable for Material " - + aMaterial.mName); + GT_Log.err.println( + "OrePrefix " + aPrefix.name() + + " cannot be registered as a cable for Material " + + aMaterial.mName); return; } @@ -207,7 +207,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr craftingListRubber.add(OrePrefixes.plate.get(Materials.Rubber)); } GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), craftingListRubber.toArray()); + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + craftingListRubber.toArray()); GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Rubber), costMultiplier), @@ -272,13 +273,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier)}, + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {aStack, dielectric.getDustSmall(costMultiplier)}, + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, @@ -310,13 +312,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier)}, + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {aStack, dielectric.getDustSmall(costMultiplier)}, + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, @@ -350,15 +353,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier) - }, + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {aStack, dielectric.getDustSmall(costMultiplier)}, + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, @@ -367,66 +369,60 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } } else { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - aStack, - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier), - GT_Utility.getIntegratedCircuit(24) - }, + new ItemStack[] { aStack, + GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier), + GT_Utility.getIntegratedCircuit(24) }, Materials.Silicone.getMolten(costMultiplier * 72), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - aStack, - GT_OreDictUnificator.get( - OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier), - GT_Utility.getIntegratedCircuit(24) - }, + new ItemStack[] { aStack, + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier), + GT_Utility.getIntegratedCircuit(24) }, Materials.Silicone.getMolten(costMultiplier * 72), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, calculateRecipeEU(aMaterial, 8)); for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier), + GT_OreDictUnificator + .get(OrePrefixes.foil, aMaterial, costMultiplier * 4) }, + syntheticRubber.getMolten(costMultiplier * 144), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), + 400, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier), - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4) - }, + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.PolyphenyleneSulfide, + costMultiplier * 4) }, syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, calculateRecipeEU(aMaterial, 8)); + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), + GT_OreDictUnificator + .get(OrePrefixes.foil, aMaterial, costMultiplier) }, + syntheticRubber.getMolten(costMultiplier * 36), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier), - GT_OreDictUnificator.get( - OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier * 4) - }, - syntheticRubber.getMolten(costMultiplier * 144), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), - 400, - calculateRecipeEU(aMaterial, 8)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - aStack, - dielectric.getDustSmall(costMultiplier), - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier) - }, - syntheticRubber.getMolten(costMultiplier * 36), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 8)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - aStack, - dielectric.getDustSmall(costMultiplier), - GT_OreDictUnificator.get( - OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier) - }, + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.PolyphenyleneSulfide, + costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, @@ -466,9 +462,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr @Optional.Method(modid = "appliedenergistics2") private void AE2AddNetAttunementCable(ItemStack aStack, OrePrefixes correspondingCable, Materials aMaterial) { Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, (TunnelType) tt); - Api.INSTANCE - .registries() - .p2pTunnel() + Api.INSTANCE.registries().p2pTunnel() .addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt); } // end region diff --git a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java b/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java index 39f6830555..2045172eec 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java @@ -1,14 +1,17 @@ package gregtech.loaders.postload; -import gregtech.GT_Mod; -import gregtech.api.util.GT_Utility; import java.util.Set; + import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemPickaxe; +import gregtech.GT_Mod; +import gregtech.api.util.GT_Utility; + public class GT_BlockResistanceLoader implements Runnable { + @Override public void run() { if (GT_Mod.gregtechproxy.mHardRock) { diff --git a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java index c518dea6fa..d661fb4452 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java @@ -1,17 +1,19 @@ package gregtech.loaders.postload; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; + import gregtech.GT_Mod; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; public class GT_BookAndLootLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Adding worldgenerated Chest Content."); @@ -47,140 +49,227 @@ public class GT_BookAndLootLoader implements Runnable { tChest.setMax(tChest.getMax() + 16); tChest.setMin(tChest.getMin() + 8); } - ChestGenHooks.addItem( - "bonusChest", new WeightedRandomChestContent(ItemList.Bottle_Purple_Drink.get(1L), 8, 16, 2)); + ChestGenHooks + .addItem("bonusChest", new WeightedRandomChestContent(ItemList.Bottle_Purple_Drink.get(1L), 8, 16, 2)); + ChestGenHooks + .addItem("dungeonChest", new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 20)); ChestGenHooks.addItem( - "dungeonChest", new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 20)); - ChestGenHooks.addItem( - "dungeonChest", new WeightedRandomChestContent(ItemList.Bottle_Purple_Drink.get(1L), 8, 16, 80)); + "dungeonChest", + new WeightedRandomChestContent(ItemList.Bottle_Purple_Drink.get(1L), 8, 16, 80)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), 1, 6, 120)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), + 1, + 6, + 120)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), 1, 6, 30)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), + 1, + 6, + 30)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), 1, 6, 60)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), + 1, + 6, + 60)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), 1, 6, 60)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + 1, + 6, + 60)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L), 1, 6, 60)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L), + 1, + 6, + 60)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L), 1, 6, 10)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L), + 1, + 6, + 10)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), 1, 6, 20)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), + 1, + 6, + 20)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 1, 6, 20)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), + 1, + 6, + 20)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 1, 6, 20)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), + 1, + 6, + 20)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), 1, 6, 20)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), + 1, + 6, + 20)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 1, 6, 20)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), + 1, + 6, + 20)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), 1, 6, 40)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), + 1, + 6, + 40)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), 1, 6, 40)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), + 1, + 6, + 40)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L), 1, 6, 40)); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L), + 1, + 6, + 40)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), 1, 3, 40)); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), + 1, + 3, + 40)); ChestGenHooks.addItem( - "pyramidDesertyChest", new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 2)); + "pyramidDesertyChest", + new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 2)); ChestGenHooks.addItem( "pyramidDesertyChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), 4, 16, 12)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), + 4, + 16, + 12)); ChestGenHooks.addItem( "pyramidDesertyChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Platinum, 1L), 2, 8, 4)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Platinum, 1L), + 2, + 8, + 4)); ChestGenHooks.addItem( "pyramidDesertyChest", new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 2, 8, 2)); ChestGenHooks.addItem( "pyramidDesertyChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 2, 8, 2)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), + 2, + 8, + 2)); ChestGenHooks.addItem( "pyramidDesertyChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), 2, 8, 2)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), + 2, + 8, + 2)); ChestGenHooks.addItem( "pyramidDesertyChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 2, 8, 2)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), + 2, + 8, + 2)); ChestGenHooks.addItem( "pyramidDesertyChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), 2, 8, 4)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), + 2, + 8, + 4)); ChestGenHooks.addItem( "pyramidDesertyChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), 2, 8, 4)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), + 2, + 8, + 4)); ChestGenHooks.addItem( - "pyramidJungleChest", new WeightedRandomChestContent(ItemList.Coin_Gold_Ancient.get(1L), 16, 64, 10)); + "pyramidJungleChest", + new WeightedRandomChestContent(ItemList.Coin_Gold_Ancient.get(1L), 16, 64, 10)); ChestGenHooks.addItem( "pyramidJungleChest", new WeightedRandomChestContent(ItemList.ZPM.getWithCharge(1L, 2147483647), 1, 1, 1)); ChestGenHooks.addItem( "pyramidJungleChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), 4, 16, 12)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + 4, + 16, + 12)); ChestGenHooks.addItem( "pyramidJungleChest", new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 2, 8, 2)); ChestGenHooks.addItem( "pyramidJungleChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 2, 8, 2)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), + 2, + 8, + 2)); ChestGenHooks.addItem( "pyramidJungleChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), 2, 8, 2)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), + 2, + 8, + 2)); ChestGenHooks.addItem( "pyramidJungleChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 2, 8, 2)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), + 2, + 8, + 2)); ChestGenHooks.addItem( "pyramidJungleChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), 2, 8, 4)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), + 2, + 8, + 4)); ChestGenHooks.addItem( "pyramidJungleChest", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), 2, 8, 4)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), + 2, + 8, + 4)); ChestGenHooks.addItem( "pyramidJungleDispenser", @@ -188,136 +277,228 @@ public class GT_BookAndLootLoader implements Runnable { ChestGenHooks.addItem( "pyramidJungleDispenser", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L), 8, 16, 20)); + GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L), + 8, + 16, + 20)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), 1, 4, 12)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), + 1, + 4, + 12)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), 1, 4, 3)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), + 1, + 4, + 3)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), 1, 4, 6)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), + 1, + 4, + 6)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), 1, 4, 6)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + 1, + 4, + 6)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 1, 4, 2)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), + 1, + 4, + 2)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), 1, 4, 2)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L), + 1, + 4, + 2)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 1, 4, 2)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), + 1, + 4, + 2)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), 1, 4, 4)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), + 1, + 4, + 4)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), 1, 4, 4)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L), + 1, + 4, + 4)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 1, 4, 2)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), 1, 4, 2)); + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), + 1, + 4, + 2)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.DamascusSteel, 1L), 1, 4, 1)); + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.DamascusSteel, 1L), + 1, + 4, + 1)); ChestGenHooks.addItem( "mineshaftCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.DamascusSteel, 1L), 1, 4, 1)); + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.DamascusSteel, 1L), + 1, + 4, + 1)); - ChestGenHooks.addItem( - "villageBlacksmith", new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 1)); + ChestGenHooks + .addItem("villageBlacksmith", new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 1)); ChestGenHooks.addItem( "villageBlacksmith", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), 1, 4, 6)); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), + 1, + 4, + 6)); ChestGenHooks.addItem( "villageBlacksmith", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L), 2, 8, 6)); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L), + 2, + 8, + 6)); ChestGenHooks.addItem( "villageBlacksmith", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L), 2, 8, 12)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L), + 2, + 8, + 12)); ChestGenHooks.addItem( "villageBlacksmith", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), 4, 12, 12)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), + 4, + 12, + 12)); ChestGenHooks.addItem( "villageBlacksmith", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), 4, 12, 12)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + 4, + 12, + 12)); ChestGenHooks.addItem( "villageBlacksmith", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1L), 4, 12, 12)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1L), + 4, + 12, + 12)); ChestGenHooks.addItem( "villageBlacksmith", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L), 4, 12, 1)); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L), + 4, + 12, + 1)); ChestGenHooks.addItem( - "strongholdCrossing", new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 6)); + "strongholdCrossing", + new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 6)); ChestGenHooks.addItem( - "strongholdCrossing", new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 10)); + "strongholdCrossing", + new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 10)); ChestGenHooks.addItem( "strongholdCrossing", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.DamascusSteel, 1L), 4, 8, 6)); + GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.DamascusSteel, 1L), + 4, + 8, + 6)); ChestGenHooks.addItem( "strongholdCrossing", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Steel, 1L), 8, 16, 12)); + GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Steel, 1L), + 8, + 16, + 12)); ChestGenHooks.addItem( "strongholdCrossing", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Bronze, 1L), 8, 16, 12)); + GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Bronze, 1L), + 8, + 16, + 12)); ChestGenHooks.addItem( "strongholdCrossing", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Manganese, 1L), 4, 8, 12)); + GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Manganese, 1L), + 4, + 8, + 12)); ChestGenHooks.addItem( "strongholdCrossing", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Neodymium, 1L), 4, 8, 6)); + GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Neodymium, 1L), + 4, + 8, + 6)); ChestGenHooks.addItem( "strongholdCrossing", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Chrome, 1L), 2, 4, 6)); + GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Chrome, 1L), + 2, + 4, + 6)); ChestGenHooks.addItem( "strongholdCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.DamascusSteel, 1L), 1, 4, 6)); + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.DamascusSteel, 1L), + 1, + 4, + 6)); ChestGenHooks.addItem( "strongholdCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.DamascusSteel, 1L), 1, 4, 6)); + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.DamascusSteel, 1L), + 1, + 4, + 6)); ChestGenHooks.addItem( "strongholdCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L), 16, 48, 6)); + GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L), + 16, + 48, + 6)); ChestGenHooks.addItem( "strongholdCorridor", new WeightedRandomChestContent( - GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.SterlingSilver, 1L), 8, 24, 6)); + GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.SterlingSilver, 1L), + 8, + 24, + 6)); } } diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index c81d4d7a0f..7a5b960b3a 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -1,5 +1,16 @@ package gregtech.loaders.postload; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import cpw.mods.fml.common.Loader; import gregtech.GT_Mod; import gregtech.api.GregTech_API; @@ -16,23 +27,14 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import ic2.core.Ic2Items; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class GT_CraftingRecipeLoader implements Runnable { + private static final String aTextIron1 = "X X"; private static final String aTextIron2 = "XXX"; - private static final long bits_no_remove_buffered = - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED; - private static final long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE + private static final long bits_no_remove_buffered = GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.BUFFERED; + private static final long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED; private static final String aTextPlateWrench = "PwP"; @@ -42,11 +44,12 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( new ItemStack(Items.bucket, 1), bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"XhX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron)}); + new Object[] { "XhX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron) }); if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Bucket", true)) { - GT_ModHandler.addCraftingRecipe(new ItemStack(Items.bucket, 1), bits_no_remove_buffered, new Object[] { - aTextIron1, " X ", 'X', OrePrefixes.ingot.get(Materials.AnyIron) - }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Items.bucket, 1), + bits_no_remove_buffered, + new Object[] { aTextIron1, " X ", 'X', OrePrefixes.ingot.get(Materials.AnyIron) }); } ItemStack tMat = new ItemStack(Items.iron_ingot); if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.PressurePlate", true)) { @@ -55,17 +58,8 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( tStack, bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { - "ShS", - "XZX", - "SdS", - 'X', - OrePrefixes.plate.get(Materials.AnyIron), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'Z', - OrePrefixes.spring.get(Materials.Steel) - }); + new Object[] { "ShS", "XZX", "SdS", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S', + OrePrefixes.screw.get(Materials.Steel), 'Z', OrePrefixes.spring.get(Materials.Steel) }); } } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Door", true)) { @@ -74,17 +68,8 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( tStack, bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { - "XX ", - "XXh", - "XX ", - 'X', - OrePrefixes.plate.get(Materials.AnyIron), - 'S', - OrePrefixes.stick.get(Materials.Wood), - 'I', - OrePrefixes.ingot.get(Materials.AnyIron) - }); + new Object[] { "XX ", "XXh", "XX ", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S', + OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); } } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Cauldron", true)) { @@ -93,40 +78,21 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( tStack, bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { - aTextIron1, - "XhX", - aTextIron2, - 'X', - OrePrefixes.plate.get(Materials.AnyIron), - 'S', - OrePrefixes.stick.get(Materials.Wood), - 'I', - OrePrefixes.ingot.get(Materials.AnyIron) - }); + new Object[] { aTextIron1, "XhX", aTextIron2, 'X', OrePrefixes.plate.get(Materials.AnyIron), + 'S', OrePrefixes.stick.get(Materials.Wood), 'I', + OrePrefixes.ingot.get(Materials.AnyIron) }); } } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Hopper", true)) { ItemStack tStack; - if (null - != (tStack = GT_ModHandler.removeRecipe( - tMat, null, tMat, tMat, new ItemStack(Blocks.chest, 1, 0), tMat, null, tMat, null))) { + if (null != (tStack = GT_ModHandler + .removeRecipe(tMat, null, tMat, tMat, new ItemStack(Blocks.chest, 1, 0), tMat, null, tMat, null))) { GT_ModHandler.addCraftingRecipe( tStack, bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { - "XwX", - "XCX", - " X ", - 'X', - OrePrefixes.plate.get(Materials.AnyIron), - 'S', - OrePrefixes.stick.get(Materials.Wood), - 'I', - OrePrefixes.ingot.get(Materials.AnyIron), - 'C', - "craftingChest" - }); + new Object[] { "XwX", "XCX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S', + OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron), + 'C', "craftingChest" }); } } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Bars", true)) { @@ -136,33 +102,16 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( tStack, bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { - " w ", - aTextIron2, - aTextIron2, - 'X', - OrePrefixes.stick.get(Materials.AnyIron), - 'S', - OrePrefixes.stick.get(Materials.Wood), - 'I', - OrePrefixes.ingot.get(Materials.AnyIron) - }); + new Object[] { " w ", aTextIron2, aTextIron2, 'X', OrePrefixes.stick.get(Materials.AnyIron), + 'S', OrePrefixes.stick.get(Materials.Wood), 'I', + OrePrefixes.ingot.get(Materials.AnyIron) }); } } GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("ironFence", 6L), bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - aTextIron2, - aTextIron2, - " w ", - 'X', - OrePrefixes.stick.get(Materials.AnyIron), - 'S', - OrePrefixes.stick.get(Materials.Wood), - 'I', - OrePrefixes.ingot.get(Materials.AnyIron) - }); + new Object[] { aTextIron2, aTextIron2, " w ", 'X', OrePrefixes.stick.get(Materials.AnyIron), 'S', + OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); tMat = new ItemStack(Items.gold_ingot); if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Gold.PressurePlate", true)) { @@ -171,17 +120,8 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( tStack, bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] { - "ShS", - "XZX", - "SdS", - 'X', - OrePrefixes.plate.get(Materials.Gold), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'Z', - OrePrefixes.spring.get(Materials.Steel) - }); + new Object[] { "ShS", "XZX", "SdS", 'X', OrePrefixes.plate.get(Materials.Gold), 'S', + OrePrefixes.screw.get(Materials.Steel), 'Z', OrePrefixes.spring.get(Materials.Steel) }); } } tMat = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L); @@ -191,7 +131,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( tStack, bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, - new Object[] {aTextIron2, aTextIron2, 'X', OrePrefixes.plate.get(Materials.Rubber)}); + new Object[] { aTextIron2, aTextIron2, 'X', OrePrefixes.plate.get(Materials.Rubber) }); } } GT_ModHandler.removeRecipeByOutputDelayed(ItemList.Bottle_Empty.get(1L)); @@ -214,623 +154,588 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 2)); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 4)); - ItemStack tStack = GT_ModHandler.removeRecipe( - new ItemStack(Blocks.planks, 1, 0), null, null, new ItemStack(Blocks.planks, 1, 0)); + ItemStack tStack = GT_ModHandler + .removeRecipe(new ItemStack(Blocks.planks, 1, 0), null, null, new ItemStack(Blocks.planks, 1, 0)); if (tStack != null) { GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount( GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, tStack), bits_no_remove_buffered, - new Object[] {"s", "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood)}); + new Object[] { "s", "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood) }); GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize / 2 : tStack.stackSize, tStack), + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize / 2 : tStack.stackSize, + tStack), bits_no_remove_buffered, - new Object[] {"P", "P", 'P', OrePrefixes.plank.get(Materials.Wood)}); + new Object[] { "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood) }); } GT_ModHandler.addCraftingRecipe( new ItemStack(Blocks.stone_button, 2, 0), bits_no_remove_buffered, - new Object[] {"S", "S", 'S', OrePrefixes.stone}); + new Object[] { "S", "S", 'S', OrePrefixes.stone }); GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Blocks.stone_button, 1, 0), bits_no_remove_buffered, new Object[] {OrePrefixes.stone}); + new ItemStack(Blocks.stone_button, 1, 0), + bits_no_remove_buffered, + new Object[] { OrePrefixes.stone }); GT_Log.out.println("GT_Mod: Adding Vanilla Convenience Recipes."); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.stonebrick, 1, 3), bits_no_remove_buffered, new Object[] { - "f", "X", 'X', new ItemStack(Blocks.double_stone_slab, 1, 8) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.gravel, 1, 0), bits_no_remove_buffered, new Object[] { - "h", "X", 'X', new ItemStack(Blocks.cobblestone, 1, 0) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.sand, 1, 0), bits_no_remove_buffered, new Object[] { - "h", "X", 'X', new ItemStack(Blocks.gravel, 1, 0) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.cobblestone, 1, 0), bits_no_remove_buffered, new Object[] { - "h", "X", 'X', new ItemStack(Blocks.stone, 1, 0) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.stonebrick, 1, 2), bits_no_remove_buffered, new Object[] { - "h", "X", 'X', new ItemStack(Blocks.stonebrick, 1, 0) - }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.stonebrick, 1, 3), + bits_no_remove_buffered, + new Object[] { "f", "X", 'X', new ItemStack(Blocks.double_stone_slab, 1, 8) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.gravel, 1, 0), + bits_no_remove_buffered, + new Object[] { "h", "X", 'X', new ItemStack(Blocks.cobblestone, 1, 0) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.sand, 1, 0), + bits_no_remove_buffered, + new Object[] { "h", "X", 'X', new ItemStack(Blocks.gravel, 1, 0) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.cobblestone, 1, 0), + bits_no_remove_buffered, + new Object[] { "h", "X", 'X', new ItemStack(Blocks.stone, 1, 0) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.stonebrick, 1, 2), + bits_no_remove_buffered, + new Object[] { "h", "X", 'X', new ItemStack(Blocks.stonebrick, 1, 0) }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.double_stone_slab, 1, 8), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.double_stone_slab, 1, 0)}); + new Object[] { new ItemStack(Blocks.double_stone_slab, 1, 0) }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.double_stone_slab, 1, 0), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.double_stone_slab, 1, 8)}); + new Object[] { new ItemStack(Blocks.double_stone_slab, 1, 8) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Blocks.double_stone_slab, 1, 0), bits_no_remove_buffered, - new Object[] {"B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 0)}); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.cobblestone, 1, 0), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 3) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.brick_block, 1, 0), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 4) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.stonebrick, 1, 0), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 5) - }); + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 0) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.cobblestone, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 3) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.brick_block, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 4) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.stonebrick, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 5) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Blocks.nether_brick, 1, 0), bits_no_remove_buffered, - new Object[] {"B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 6)}); + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 6) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Blocks.quartz_block, 1, 0), bits_no_remove_buffered, - new Object[] {"B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 7)}); + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 7) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Blocks.double_stone_slab, 1, 8), bits_no_remove_buffered, - new Object[] {"B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 8)}); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.planks, 1, 0), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 0) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.planks, 1, 1), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 1) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.planks, 1, 2), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 2) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.planks, 1, 3), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 3) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.planks, 1, 4), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 4) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.planks, 1, 5), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 5) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.planks, 1, 6), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 6) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.planks, 1, 7), bits_no_remove_buffered, new Object[] { - "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 7) - }); - - GT_ModHandler.addCraftingRecipe(new ItemStack(Items.stick, 2, 0), bits_no_remove_buffered, new Object[] { - "s", "X", 'X', new ItemStack(Blocks.deadbush, 1, 32767) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Items.stick, 2, 0), bits_no_remove_buffered, new Object[] { - "s", "X", 'X', new ItemStack(Blocks.tallgrass, 1, 0) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Items.stick, 1, 0), bits_no_remove_buffered, new Object[] { - "s", "X", 'X', OrePrefixes.treeSapling - }); - - GT_ModHandler.addCraftingRecipe(new ItemStack(Items.comparator, 1, 0), bits_no_remove_buffered, new Object[] { - " T ", - "TQT", - "SSS", - 'Q', - OreDictNames.craftingQuartz, - 'S', - OrePrefixes.stoneSmooth, - 'T', - OreDictNames.craftingRedstoneTorch - }); + new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 8) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.planks, 1, 0), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 0) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.planks, 1, 1), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 1) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.planks, 1, 2), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 2) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.planks, 1, 3), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 3) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.planks, 1, 4), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 4) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.planks, 1, 5), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 5) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.planks, 1, 6), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 6) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.planks, 1, 7), + bits_no_remove_buffered, + new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 7) }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(Items.stick, 2, 0), + bits_no_remove_buffered, + new Object[] { "s", "X", 'X', new ItemStack(Blocks.deadbush, 1, 32767) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Items.stick, 2, 0), + bits_no_remove_buffered, + new Object[] { "s", "X", 'X', new ItemStack(Blocks.tallgrass, 1, 0) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Items.stick, 1, 0), + bits_no_remove_buffered, + new Object[] { "s", "X", 'X', OrePrefixes.treeSapling }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(Items.comparator, 1, 0), + bits_no_remove_buffered, + new Object[] { " T ", "TQT", "SSS", 'Q', OreDictNames.craftingQuartz, 'S', OrePrefixes.stoneSmooth, 'T', + OreDictNames.craftingRedstoneTorch }); GT_Log.out.println("GT_Mod: Adding Tool Recipes."); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.minecart, 1), bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] { - " h ", - "PwP", - "WPW", - 'P', - OrePrefixes.plate.get(Materials.AnyIron), - 'W', - ItemList.Component_Minecart_Wheels_Iron - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Items.minecart, 1), bits_no_remove_buffered, new Object[] { - " h ", - "PwP", - "WPW", - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'W', - ItemList.Component_Minecart_Wheels_Steel - }); + new Object[] { " h ", "PwP", "WPW", 'P', OrePrefixes.plate.get(Materials.AnyIron), 'W', + ItemList.Component_Minecart_Wheels_Iron }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Items.minecart, 1), + bits_no_remove_buffered, + new Object[] { " h ", "PwP", "WPW", 'P', OrePrefixes.plate.get(Materials.Steel), 'W', + ItemList.Component_Minecart_Wheels_Steel }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.chest_minecart, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', OreDictNames.craftingChest}); + new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.furnace_minecart, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', OreDictNames.craftingFurnace}); + new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', OreDictNames.craftingFurnace }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.hopper_minecart, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] { - "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', new ItemStack(Blocks.hopper, 1, 32767) - }); + new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', + new ItemStack(Blocks.hopper, 1, 32767) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.tnt_minecart, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', new ItemStack(Blocks.tnt, 1, 32767) - }); + new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', + new ItemStack(Blocks.tnt, 1, 32767) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.chainmail_helmet, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"RRR", "RhR", 'R', OrePrefixes.ring.get(Materials.Steel)}); + new Object[] { "RRR", "RhR", 'R', OrePrefixes.ring.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.chainmail_chestplate, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"RhR", "RRR", "RRR", 'R', OrePrefixes.ring.get(Materials.Steel)}); + new Object[] { "RhR", "RRR", "RRR", 'R', OrePrefixes.ring.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.chainmail_leggings, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"RRR", "RhR", "R R", 'R', OrePrefixes.ring.get(Materials.Steel)}); + new Object[] { "RRR", "RhR", "R R", 'R', OrePrefixes.ring.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.chainmail_boots, 1), - bits_no_remove_buffered - | GT_ModHandler.RecipeBits.REVERSIBLE + bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] {"R R", "RhR", 'R', OrePrefixes.ring.get(Materials.Steel)}); + new Object[] { "R R", "RhR", 'R', OrePrefixes.ring.get(Materials.Steel) }); GT_Log.out.println("GT_Mod: Adding Wool and Color releated Recipes."); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 1), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeOrange}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeOrange }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 2), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeMagenta}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeMagenta }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 3), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeLightBlue}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeLightBlue }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 4), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeYellow}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeYellow }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 5), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeLime}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeLime }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 6), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyePink}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyePink }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 7), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeGray}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeGray }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 8), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeLightGray}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeLightGray }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 9), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeCyan}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeCyan }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 10), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyePurple}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyePurple }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 11), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeBlue}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeBlue }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 12), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeBrown}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeBrown }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 13), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeGreen}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeGreen }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 14), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeRed}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeRed }); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Blocks.wool, 1, 15), bits_no_remove_buffered, - new Object[] {new ItemStack(Blocks.wool, 1, 0), Dyes.dyeBlack}); + new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeBlack }); GT_ModHandler.addCraftingRecipe( new ItemStack(Blocks.stained_glass, 8, 0), bits_no_remove_buffered, - new Object[] {"GGG", "GDG", "GGG", 'G', new ItemStack(Blocks.glass, 1), 'D', Dyes.dyeWhite}); + new Object[] { "GGG", "GDG", "GGG", 'G', new ItemStack(Blocks.glass, 1), 'D', Dyes.dyeWhite }); GT_Log.out.println("GT_Mod: Putting a Potato on a Stick."); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Packaged_PotatoChips.get(1L), bits_no_remove_buffered, - new Object[] {OrePrefixes.foil.get(Materials.Aluminium), ItemList.Food_PotatoChips}); + new Object[] { OrePrefixes.foil.get(Materials.Aluminium), ItemList.Food_PotatoChips }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Packaged_ChiliChips.get(1L), bits_no_remove_buffered, - new Object[] {OrePrefixes.foil.get(Materials.Aluminium), ItemList.Food_ChiliChips}); + new Object[] { OrePrefixes.foil.get(Materials.Aluminium), ItemList.Food_ChiliChips }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Packaged_Fries.get(1L), bits_no_remove_buffered, - new Object[] {OrePrefixes.plateDouble.get(Materials.Paper), ItemList.Food_Fries}); + new Object[] { OrePrefixes.plateDouble.get(Materials.Paper), ItemList.Food_Fries }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Chum_On_Stick.get(1L), bits_no_remove_buffered, - new Object[] {OrePrefixes.stick.get(Materials.Wood), ItemList.Food_Chum}); + new Object[] { OrePrefixes.stick.get(Materials.Wood), ItemList.Food_Chum }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Potato_On_Stick.get(1L), bits_no_remove_buffered, - new Object[] {OrePrefixes.stick.get(Materials.Wood), ItemList.Food_Raw_Potato}); + new Object[] { OrePrefixes.stick.get(Materials.Wood), ItemList.Food_Raw_Potato }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Potato_On_Stick_Roasted.get(1L), bits_no_remove_buffered, - new Object[] {OrePrefixes.stick.get(Materials.Wood), ItemList.Food_Baked_Potato}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Food_Dough.get(1L), bits_no_remove_buffered, new Object[] { - OrePrefixes.bucket.get(Materials.Water), OrePrefixes.dust.get(Materials.Wheat) - }); + new Object[] { OrePrefixes.stick.get(Materials.Wood), ItemList.Food_Baked_Potato }); + GT_ModHandler.addShapelessCraftingRecipe( + ItemList.Food_Dough.get(1L), + bits_no_remove_buffered, + new Object[] { OrePrefixes.bucket.get(Materials.Water), OrePrefixes.dust.get(Materials.Wheat) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Dough_Sugar.get(2L), bits_no_remove_buffered, - new Object[] {"foodDough", OrePrefixes.dust.get(Materials.Sugar)}); + new Object[] { "foodDough", OrePrefixes.dust.get(Materials.Sugar) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Dough_Chocolate.get(2L), bits_no_remove_buffered, - new Object[] {"foodDough", OrePrefixes.dust.get(Materials.Cocoa)}); + new Object[] { "foodDough", OrePrefixes.dust.get(Materials.Cocoa) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Dough_Chocolate.get(2L), bits_no_remove_buffered, - new Object[] {"foodDough", OrePrefixes.dust.get(Materials.Chocolate)}); + new Object[] { "foodDough", OrePrefixes.dust.get(Materials.Chocolate) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Flat_Dough.get(1L), bits_no_remove_buffered, - new Object[] {"foodDough", ToolDictNames.craftingToolRollingPin}); + new Object[] { "foodDough", ToolDictNames.craftingToolRollingPin }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Raw_Bun.get(1L), bits_no_remove_buffered, new Object[] {"foodDough"}); + ItemList.Food_Raw_Bun.get(1L), + bits_no_remove_buffered, + new Object[] { "foodDough" }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Raw_Bread.get(1L), bits_no_remove_buffered, new Object[] {"foodDough", "foodDough"}); + ItemList.Food_Raw_Bread.get(1L), + bits_no_remove_buffered, + new Object[] { "foodDough", "foodDough" }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Raw_Baguette.get(1L), bits_no_remove_buffered, - new Object[] {"foodDough", "foodDough", "foodDough"}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Food_Raw_Cake.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Dough_Sugar, ItemList.Food_Dough_Sugar, ItemList.Food_Dough_Sugar, ItemList.Food_Dough_Sugar - }); + new Object[] { "foodDough", "foodDough", "foodDough" }); + GT_ModHandler.addShapelessCraftingRecipe( + ItemList.Food_Raw_Cake.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Dough_Sugar, ItemList.Food_Dough_Sugar, ItemList.Food_Dough_Sugar, + ItemList.Food_Dough_Sugar }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_ChiliChips.get(1L), bits_no_remove_buffered, - new Object[] {ItemList.Food_PotatoChips, OrePrefixes.dust.get(Materials.Chili)}); + new Object[] { ItemList.Food_PotatoChips, OrePrefixes.dust.get(Materials.Chili) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Sliced_Buns.get(1L), bits_no_remove_buffered, - new Object[] {ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun}); + new Object[] { ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Sliced_Breads.get(1L), bits_no_remove_buffered, - new Object[] {ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread}); + new Object[] { ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Sliced_Baguettes.get(1L), bits_no_remove_buffered, - new Object[] {ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette}); + new Object[] { ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Sliced_Bun.get(2L), bits_no_remove_buffered, new Object[] {ItemList.Food_Sliced_Buns}); + ItemList.Food_Sliced_Bun.get(2L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Buns }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Sliced_Bread.get(2L), bits_no_remove_buffered, new Object[] {ItemList.Food_Sliced_Breads - }); + ItemList.Food_Sliced_Bread.get(2L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Breads }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Sliced_Baguette.get(2L), bits_no_remove_buffered, - new Object[] {ItemList.Food_Sliced_Baguettes}); + new Object[] { ItemList.Food_Sliced_Baguettes }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Burger_Veggie.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Buns, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Onion - }); + ItemList.Food_Burger_Veggie.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Buns, ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Tomato, + ItemList.Food_Sliced_Onion }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Burger_Cheese.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Buns, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese - }); + ItemList.Food_Burger_Cheese.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Buns, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, + ItemList.Food_Sliced_Cheese }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Burger_Meat.get(1L), bits_no_remove_buffered, - new Object[] {ItemList.Food_Sliced_Buns, OrePrefixes.dust.get(Materials.MeatCooked)}); + new Object[] { ItemList.Food_Sliced_Buns, OrePrefixes.dust.get(Materials.MeatCooked) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Burger_Chum.get(1L), bits_no_remove_buffered, - new Object[] {ItemList.Food_Sliced_Buns, ItemList.Food_Chum}); + new Object[] { ItemList.Food_Sliced_Buns, ItemList.Food_Chum }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Burger_Veggie.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Bun, - ItemList.Food_Sliced_Bun, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Onion - }); + ItemList.Food_Burger_Veggie.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Cucumber, + ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Onion }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Burger_Cheese.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Bun, - ItemList.Food_Sliced_Bun, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese - }); + ItemList.Food_Burger_Cheese.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Cheese, + ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Burger_Meat.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun, OrePrefixes.dust.get(Materials.MeatCooked) - }); + ItemList.Food_Burger_Meat.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun, + OrePrefixes.dust.get(Materials.MeatCooked) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Burger_Chum.get(1L), bits_no_remove_buffered, - new Object[] {ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun, ItemList.Food_Chum}); + new Object[] { ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun, ItemList.Food_Chum }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Sandwich_Veggie.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Breads, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Onion - }); + ItemList.Food_Sandwich_Veggie.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Breads, ItemList.Food_Sliced_Cucumber, + ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Tomato, + ItemList.Food_Sliced_Onion }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Sandwich_Cheese.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Breads, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese - }); + ItemList.Food_Sandwich_Cheese.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Breads, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, + ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Sandwich_Bacon.get(1L), bits_no_remove_buffered, - new Object[] {ItemList.Food_Sliced_Breads, new ItemStack(Items.cooked_porkchop, 1)}); + new Object[] { ItemList.Food_Sliced_Breads, new ItemStack(Items.cooked_porkchop, 1) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Sandwich_Steak.get(1L), bits_no_remove_buffered, - new Object[] {ItemList.Food_Sliced_Breads, new ItemStack(Items.cooked_beef, 1)}); + new Object[] { ItemList.Food_Sliced_Breads, new ItemStack(Items.cooked_beef, 1) }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Sandwich_Veggie.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Bread, - ItemList.Food_Sliced_Bread, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Onion - }); + ItemList.Food_Sandwich_Veggie.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Cucumber, + ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Tomato, + ItemList.Food_Sliced_Onion }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Sandwich_Cheese.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Bread, - ItemList.Food_Sliced_Bread, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese - }); + ItemList.Food_Sandwich_Cheese.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Cheese, + ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, + ItemList.Food_Sliced_Cheese }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Sandwich_Bacon.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread, new ItemStack(Items.cooked_porkchop, 1) - }); + ItemList.Food_Sandwich_Bacon.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread, + new ItemStack(Items.cooked_porkchop, 1) }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Sandwich_Steak.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread, new ItemStack(Items.cooked_beef, 1) - }); + ItemList.Food_Sandwich_Steak.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread, + new ItemStack(Items.cooked_beef, 1) }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Large_Sandwich_Veggie.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Baguettes, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Onion - }); + ItemList.Food_Large_Sandwich_Veggie.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Baguettes, ItemList.Food_Sliced_Cucumber, + ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Tomato, + ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Onion }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Large_Sandwich_Cheese.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Baguettes, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese - }); + ItemList.Food_Large_Sandwich_Cheese.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Baguettes, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, + ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, + ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Large_Sandwich_Bacon.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Baguettes, - new ItemStack(Items.cooked_porkchop, 1), - new ItemStack(Items.cooked_porkchop, 1) - }); + ItemList.Food_Large_Sandwich_Bacon.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Baguettes, new ItemStack(Items.cooked_porkchop, 1), + new ItemStack(Items.cooked_porkchop, 1) }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Large_Sandwich_Steak.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Baguettes, - new ItemStack(Items.cooked_beef, 1), - new ItemStack(Items.cooked_beef, 1) - }); + ItemList.Food_Large_Sandwich_Steak.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Baguettes, new ItemStack(Items.cooked_beef, 1), + new ItemStack(Items.cooked_beef, 1) }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Large_Sandwich_Veggie.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Baguette, - ItemList.Food_Sliced_Baguette, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Onion - }); + ItemList.Food_Large_Sandwich_Veggie.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette, + ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Cucumber, + ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Tomato, + ItemList.Food_Sliced_Onion }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Large_Sandwich_Cheese.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Baguette, - ItemList.Food_Sliced_Baguette, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese - }); + ItemList.Food_Large_Sandwich_Cheese.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette, + ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, + ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, + ItemList.Food_Sliced_Cheese }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Large_Sandwich_Bacon.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Baguette, - ItemList.Food_Sliced_Baguette, - new ItemStack(Items.cooked_porkchop, 1), - new ItemStack(Items.cooked_porkchop, 1) - }); + ItemList.Food_Large_Sandwich_Bacon.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette, + new ItemStack(Items.cooked_porkchop, 1), new ItemStack(Items.cooked_porkchop, 1) }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Large_Sandwich_Steak.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Sliced_Baguette, - ItemList.Food_Sliced_Baguette, - new ItemStack(Items.cooked_beef, 1), - new ItemStack(Items.cooked_beef, 1) - }); + ItemList.Food_Large_Sandwich_Steak.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette, + new ItemStack(Items.cooked_beef, 1), new ItemStack(Items.cooked_beef, 1) }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Raw_Pizza_Veggie.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Flat_Dough, - ItemList.Food_Sliced_Cucumber, - ItemList.Food_Sliced_Tomato, - ItemList.Food_Sliced_Onion - }); + ItemList.Food_Raw_Pizza_Veggie.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Flat_Dough, ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Tomato, + ItemList.Food_Sliced_Onion }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Food_Raw_Pizza_Cheese.get(1L), bits_no_remove_buffered, new Object[] { - ItemList.Food_Flat_Dough, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese, - ItemList.Food_Sliced_Cheese - }); + ItemList.Food_Raw_Pizza_Cheese.get(1L), + bits_no_remove_buffered, + new Object[] { ItemList.Food_Flat_Dough, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, + ItemList.Food_Sliced_Cheese }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Food_Raw_Pizza_Meat.get(1L), bits_no_remove_buffered, - new Object[] {ItemList.Food_Flat_Dough, OrePrefixes.dust.get(Materials.MeatCooked)}); + new Object[] { ItemList.Food_Flat_Dough, OrePrefixes.dust.get(Materials.MeatCooked) }); GT_ModHandler.addCraftingRecipe( - ItemList.Food_Sliced_Cheese.get(4L), bits_no_remove_buffered, new Object[] {"kX", 'X', "foodCheese"}); + ItemList.Food_Sliced_Cheese.get(4L), + bits_no_remove_buffered, + new Object[] { "kX", 'X', "foodCheese" }); GT_ModHandler.addCraftingRecipe( - ItemList.Food_Sliced_Lemon.get(4L), bits_no_remove_buffered, new Object[] {"kX", 'X', "cropLemon"}); + ItemList.Food_Sliced_Lemon.get(4L), + bits_no_remove_buffered, + new Object[] { "kX", 'X', "cropLemon" }); GT_ModHandler.addCraftingRecipe( - ItemList.Food_Sliced_Tomato.get(4L), bits_no_remove_buffered, new Object[] {"kX", 'X', "cropTomato"}); + ItemList.Food_Sliced_Tomato.get(4L), + bits_no_remove_buffered, + new Object[] { "kX", 'X', "cropTomato" }); GT_ModHandler.addCraftingRecipe( - ItemList.Food_Sliced_Onion.get(4L), bits_no_remove_buffered, new Object[] {"kX", 'X', "cropOnion"}); + ItemList.Food_Sliced_Onion.get(4L), + bits_no_remove_buffered, + new Object[] { "kX", 'X', "cropOnion" }); GT_ModHandler.addCraftingRecipe( - ItemList.Food_Sliced_Cucumber.get(4L), bits_no_remove_buffered, new Object[] {"kX", 'X', "cropCucumber" - }); - GT_ModHandler.addCraftingRecipe(ItemList.Food_Sliced_Bun.get(2L), bits_no_remove_buffered, new Object[] { - "kX", 'X', ItemList.Food_Baked_Bun - }); - GT_ModHandler.addCraftingRecipe(ItemList.Food_Sliced_Bread.get(2L), bits_no_remove_buffered, new Object[] { - "kX", 'X', ItemList.Food_Baked_Bread - }); - GT_ModHandler.addCraftingRecipe(ItemList.Food_Sliced_Baguette.get(2L), bits_no_remove_buffered, new Object[] { - "kX", 'X', ItemList.Food_Baked_Baguette - }); - GT_ModHandler.addCraftingRecipe( - ItemList.Food_Raw_PotatoChips.get(1L), bits_no_remove_buffered, new Object[] {"kX", 'X', "cropPotato"}); - GT_ModHandler.addCraftingRecipe(ItemList.Food_Raw_Cookie.get(4L), bits_no_remove_buffered, new Object[] { - "kX", 'X', ItemList.Food_Dough_Chocolate - }); - - GT_ModHandler.addCraftingRecipe( - ItemList.Food_Raw_Fries.get(1L), bits_no_remove_buffered, new Object[] {"k", "X", 'X', "cropPotato"}); - GT_ModHandler.addCraftingRecipe(new ItemStack(Items.bowl, 1), bits_no_remove_buffered, new Object[] { - "k", "X", 'X', OrePrefixes.plank.get(Materials.Wood) - }); + ItemList.Food_Sliced_Cucumber.get(4L), + bits_no_remove_buffered, + new Object[] { "kX", 'X', "cropCucumber" }); + GT_ModHandler.addCraftingRecipe( + ItemList.Food_Sliced_Bun.get(2L), + bits_no_remove_buffered, + new Object[] { "kX", 'X', ItemList.Food_Baked_Bun }); + GT_ModHandler.addCraftingRecipe( + ItemList.Food_Sliced_Bread.get(2L), + bits_no_remove_buffered, + new Object[] { "kX", 'X', ItemList.Food_Baked_Bread }); + GT_ModHandler.addCraftingRecipe( + ItemList.Food_Sliced_Baguette.get(2L), + bits_no_remove_buffered, + new Object[] { "kX", 'X', ItemList.Food_Baked_Baguette }); + GT_ModHandler.addCraftingRecipe( + ItemList.Food_Raw_PotatoChips.get(1L), + bits_no_remove_buffered, + new Object[] { "kX", 'X', "cropPotato" }); + GT_ModHandler.addCraftingRecipe( + ItemList.Food_Raw_Cookie.get(4L), + bits_no_remove_buffered, + new Object[] { "kX", 'X', ItemList.Food_Dough_Chocolate }); + + GT_ModHandler.addCraftingRecipe( + ItemList.Food_Raw_Fries.get(1L), + bits_no_remove_buffered, + new Object[] { "k", "X", 'X', "cropPotato" }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Items.bowl, 1), + bits_no_remove_buffered, + new Object[] { "k", "X", 'X', OrePrefixes.plank.get(Materials.Wood) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Rubber, 1L), bits_no_remove_buffered, - new Object[] {"k", "X", 'X', OrePrefixes.plate.get(Materials.Rubber)}); + new Object[] { "k", "X", 'X', OrePrefixes.plate.get(Materials.Rubber) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, Materials.Flint, 1L), bits_no_remove_buffered, - new Object[] {"f", "X", 'X', new ItemStack(Items.flint, 1, 32767)}); + new Object[] { "f", "X", 'X', new ItemStack(Items.flint, 1, 32767) }); GT_ModHandler.addCraftingRecipe( new ItemStack(Items.arrow, 1), bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, - new Object[] { - " H", - " S ", - "F ", - 'H', - new ItemStack(Items.flint, 1, 32767), - 'S', - OrePrefixes.stick.get(Materials.Wood), - 'F', - OreDictNames.craftingFeather - }); + new Object[] { " H", " S ", "F ", 'H', new ItemStack(Items.flint, 1, 32767), 'S', + OrePrefixes.stick.get(Materials.Wood), 'F', OreDictNames.craftingFeather }); GT_ModHandler.removeRecipe( - new ItemStack(Blocks.planks), null, new ItemStack(Blocks.planks), null, new ItemStack(Blocks.planks)); + new ItemStack(Blocks.planks), + null, + new ItemStack(Blocks.planks), + null, + new ItemStack(Blocks.planks)); GT_ModHandler.removeRecipeByOutputDelayed(ItemList.Food_Baked_Bread.get(1L)); GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.cookie, 1)); GT_ModHandler.removeRecipe( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L)); - if (null - != GT_Utility.setStack( - GT_ModHandler.getRecipeOutput( - true, - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), - null, - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L)), - GT_OreDictUnificator.get( - OrePrefixes.ingot, - Materials.Bronze, - GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, "bronzeingotcrafting", true) - ? 1L + if (null != GT_Utility.setStack( + GT_ModHandler.getRecipeOutput( + true, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), + null, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L)), + GT_OreDictUnificator.get( + OrePrefixes.ingot, + Materials.Bronze, + GregTech_API.sRecipeFile + .get(ConfigCategories.Recipes.disabledrecipes, "bronzeingotcrafting", true) ? 1L : 2L))) { GT_Log.out.println("GT_Mod: Changed Forestrys Bronze Recipe"); } @@ -856,15 +761,8 @@ public class GT_CraftingRecipeLoader implements Runnable { new ItemStack(Blocks.sand, 1, 0), null), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "S", - "A", - "S", - 'A', - OrePrefixes.dust.get(Materials.Apatite), - 'S', - new ItemStack(Blocks.sand, 1, 32767) - }); + new Object[] { "S", "A", "S", 'A', OrePrefixes.dust.get(Materials.Apatite), 'S', + new ItemStack(Blocks.sand, 1, 32767) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getRecipeOutput( tStack, @@ -877,1149 +775,571 @@ public class GT_CraftingRecipeLoader implements Runnable { tStack, tStack), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SSS", - "SAS", - "SSS", - 'A', - OrePrefixes.dust.get(Materials.Apatite), - 'S', - OrePrefixes.dust.get(Materials.Ash) - }); + new Object[] { "SSS", "SAS", "SSS", 'A', OrePrefixes.dust.get(Materials.Apatite), 'S', + OrePrefixes.dust.get(Materials.Ash) }); GT_Log.out.println("GT_Mod: Adding Mixed Metal Ingot Recipes."); GT_ModHandler.removeRecipeByOutputDelayed(ItemList.IC2_Mixed_Metal_Ingot.get(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.AnyIron), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.AnyIron), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.AnyIron), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.AnyIron), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.AnyIron), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.AnyIron), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Nickel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Nickel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Nickel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Nickel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Nickel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(1L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Nickel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(2L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Invar), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(2L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Invar), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Invar), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(2L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Invar), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(2L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Invar), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Invar), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(2L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Steel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(2L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Steel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Steel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(2L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Steel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(2L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Steel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Steel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(4L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(4L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Titanium), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Titanium), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(4L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Titanium), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Titanium), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Titanium), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(4L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Titanium), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Tungsten), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Tungsten), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(4L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Tungsten), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Tungsten), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(3L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Tungsten), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(4L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Tungsten), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(5L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(5L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(6L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.Bronze), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(5L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(5L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(6L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.Brass), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(8L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.Chrome), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(8L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.Chrome), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(8L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.Chrome), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(10L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Z', - OrePrefixes.plate.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(10L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Z', - OrePrefixes.plate.get(Materials.Zinc) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(10L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Y', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Z', - OrePrefixes.plate.get(Materials.Aluminium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(12L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Iridium), - 'Y', - OrePrefixes.plate.get(Materials.Chrome), - 'Z', - OrePrefixes.plate.get(Materials.AnnealedCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(12L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Iridium), - 'Y', - OrePrefixes.plate.get(Materials.Chrome), - 'Z', - OrePrefixes.plate.get(Materials.RoseGold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(12L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Iridium), - 'Y', - OrePrefixes.plate.get(Materials.Chrome), - 'Z', - OrePrefixes.plate.get(Materials.AstralSilver) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(14L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Iridium), - 'Y', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Z', - OrePrefixes.plate.get(Materials.AnnealedCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(14L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Iridium), - 'Y', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Z', - OrePrefixes.plate.get(Materials.RoseGold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(14L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Iridium), - 'Y', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Z', - OrePrefixes.plate.get(Materials.AstralSilver) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(16L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.HSSG), - 'Y', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Z', - OrePrefixes.plate.get(Materials.AnnealedCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(16L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.HSSG), - 'Y', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Z', - OrePrefixes.plate.get(Materials.RoseGold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(16L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.HSSG), - 'Y', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'Z', - OrePrefixes.plate.get(Materials.AstralSilver) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(18L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.HSSE), - 'Y', - OrePrefixes.plate.get(Materials.Chrome), - 'Z', - OrePrefixes.plate.get(Materials.AnnealedCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(18L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.HSSE), - 'Y', - OrePrefixes.plate.get(Materials.Chrome), - 'Z', - OrePrefixes.plate.get(Materials.RoseGold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(18L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.HSSE), - 'Y', - OrePrefixes.plate.get(Materials.Chrome), - 'Z', - OrePrefixes.plate.get(Materials.AstralSilver) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(20L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.HSSS), - 'Y', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Z', - OrePrefixes.plate.get(Materials.AnnealedCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(20L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.HSSS), - 'Y', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Z', - OrePrefixes.plate.get(Materials.RoseGold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(20L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.HSSS), - 'Y', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'Z', - OrePrefixes.plate.get(Materials.AstralSilver) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(1L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(2L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(2L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(2L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(2L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(2L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(2L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(2L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(2L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(4L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(4L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(4L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(4L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(4L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(3L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(4L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(5L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(5L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(6L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(5L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(5L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(6L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(8L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(8L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(8L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(10L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', OrePrefixes.plate.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(10L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', OrePrefixes.plate.get(Materials.Zinc) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(10L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y', + OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', + OrePrefixes.plate.get(Materials.Aluminium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(12L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y', + OrePrefixes.plate.get(Materials.Chrome), 'Z', + OrePrefixes.plate.get(Materials.AnnealedCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(12L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y', + OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.RoseGold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(12L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y', + OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.AstralSilver) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(14L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y', + OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', + OrePrefixes.plate.get(Materials.AnnealedCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(14L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y', + OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', + OrePrefixes.plate.get(Materials.RoseGold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(14L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y', + OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', + OrePrefixes.plate.get(Materials.AstralSilver) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(16L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSG), 'Y', + OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', + OrePrefixes.plate.get(Materials.AnnealedCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(16L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSG), 'Y', + OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', + OrePrefixes.plate.get(Materials.RoseGold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(16L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSG), 'Y', + OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', + OrePrefixes.plate.get(Materials.AstralSilver) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(18L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSE), 'Y', + OrePrefixes.plate.get(Materials.Chrome), 'Z', + OrePrefixes.plate.get(Materials.AnnealedCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(18L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSE), 'Y', + OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.RoseGold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(18L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSE), 'Y', + OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.AstralSilver) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(20L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSS), 'Y', + OrePrefixes.plate.get(Materials.TungstenSteel), 'Z', + OrePrefixes.plate.get(Materials.AnnealedCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(20L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSS), 'Y', + OrePrefixes.plate.get(Materials.TungstenSteel), 'Z', + OrePrefixes.plate.get(Materials.RoseGold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(20L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSS), 'Y', + OrePrefixes.plate.get(Materials.TungstenSteel), 'Z', + OrePrefixes.plate.get(Materials.AstralSilver) }); GT_ModHandler.addCraftingRecipe( ItemList.Long_Distance_Pipeline_Fluid.get(1L), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "GPG", - "IwI", - "GPG", - 'G', - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 1L), - 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), - 'I', - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Steel, 1L) - }); + new Object[] { "GPG", "IwI", "GPG", 'G', + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), 'I', + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Steel, 1L) }); GT_ModHandler.addCraftingRecipe( ItemList.Long_Distance_Pipeline_Item.get(1L), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "GPG", - "IwI", - "GPG", - 'G', - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 1L), - 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), - 'I', - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Tin, 1L) - }); + new Object[] { "GPG", "IwI", "GPG", 'G', + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), 'I', + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Tin, 1L) }); GT_ModHandler.addCraftingRecipe( ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(32L), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PPP", - "IwI", - "PPP", - 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), - 'I', - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 1L) - }); + new Object[] { "PPP", "IwI", "PPP", 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), 'I', + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 1L) }); GT_ModHandler.addCraftingRecipe( ItemList.Long_Distance_Pipeline_Item_Pipe.get(32L), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PPP", - "IwI", - "PPP", - 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), - 'I', - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Tin, 1L) - }); + new Object[] { "PPP", "IwI", "PPP", 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), 'I', + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Tin, 1L) }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(22L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Naquadah), - 'Y', - OrePrefixes.plate.get(Materials.Iridium), - 'Z', - OrePrefixes.plate.get(Materials.HSSG) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(24L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Naquadah), - 'Y', - OrePrefixes.plate.get(Materials.Iridium), - 'Z', - OrePrefixes.plate.get(Materials.HSSE) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(26L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Naquadah), - 'Y', - OrePrefixes.plate.get(Materials.Iridium), - 'Z', - OrePrefixes.plate.get(Materials.HSSS) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(28L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.NaquadahAlloy), - 'Y', - OrePrefixes.plate.get(Materials.Osmiridium), - 'Z', - OrePrefixes.plate.get(Materials.HSSE) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(30L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.NaquadahAlloy), - 'Y', - OrePrefixes.plate.get(Materials.Osmiridium), - 'Z', - OrePrefixes.plate.get(Materials.HSSG) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(32L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.NaquadahAlloy), - 'Y', - OrePrefixes.plate.get(Materials.Osmiridium), - 'Z', - OrePrefixes.plate.get(Materials.HSSS) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(34L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Neutronium), - 'Y', - OrePrefixes.plate.get(Materials.EnergeticAlloy), - 'Z', - OrePrefixes.plate.get(Materials.Naquadah) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(36L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Neutronium), - 'Y', - OrePrefixes.plate.get(Materials.EnergeticAlloy), - 'Z', - OrePrefixes.plate.get(Materials.NaquadahAlloy) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(38L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.Neutronium), - 'Y', - OrePrefixes.plate.get(Materials.EnergeticAlloy), - 'Z', - OrePrefixes.plate.get(Materials.Draconium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(40L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.BlackPlutonium), - 'Y', - OrePrefixes.plate.get(Materials.Sunnarium), - 'Z', - OrePrefixes.plate.get(Materials.Naquadah) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(42L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.BlackPlutonium), - 'Y', - OrePrefixes.plate.get(Materials.Sunnarium), - 'Z', - OrePrefixes.plate.get(Materials.NaquadahAlloy) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(44L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.BlackPlutonium), - 'Y', - OrePrefixes.plate.get(Materials.Sunnarium), - 'Z', - OrePrefixes.plate.get(Materials.Draconium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(48L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.DraconiumAwakened), - 'Y', - OrePrefixes.plate.get(Materials.Neutronium), - 'Z', - OrePrefixes.plate.get(Materials.HSSS) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(52L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.DraconiumAwakened), - 'Y', - OrePrefixes.plate.get(Materials.Neutronium), - 'Z', - OrePrefixes.plate.get(Materials.Naquadah) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(56L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.DraconiumAwakened), - 'Y', - OrePrefixes.plate.get(Materials.Neutronium), - 'Z', - OrePrefixes.plate.get(Materials.NaquadahAlloy) - }); - GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(64L), bits_no_remove_buffered, new Object[] { - "X", - "Y", - "Z", - 'X', - OrePrefixes.plate.get(Materials.DraconiumAwakened), - 'Y', - OrePrefixes.plate.get(Materials.Neutronium), - 'Z', - OrePrefixes.plate.get(Materials.BlackPlutonium) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(22L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Naquadah), 'Y', + OrePrefixes.plate.get(Materials.Iridium), 'Z', OrePrefixes.plate.get(Materials.HSSG) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(24L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Naquadah), 'Y', + OrePrefixes.plate.get(Materials.Iridium), 'Z', OrePrefixes.plate.get(Materials.HSSE) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(26L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Naquadah), 'Y', + OrePrefixes.plate.get(Materials.Iridium), 'Z', OrePrefixes.plate.get(Materials.HSSS) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(28L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.NaquadahAlloy), 'Y', + OrePrefixes.plate.get(Materials.Osmiridium), 'Z', OrePrefixes.plate.get(Materials.HSSE) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(30L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.NaquadahAlloy), 'Y', + OrePrefixes.plate.get(Materials.Osmiridium), 'Z', OrePrefixes.plate.get(Materials.HSSG) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(32L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.NaquadahAlloy), 'Y', + OrePrefixes.plate.get(Materials.Osmiridium), 'Z', OrePrefixes.plate.get(Materials.HSSS) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(34L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Neutronium), 'Y', + OrePrefixes.plate.get(Materials.EnergeticAlloy), 'Z', + OrePrefixes.plate.get(Materials.Naquadah) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(36L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Neutronium), 'Y', + OrePrefixes.plate.get(Materials.EnergeticAlloy), 'Z', + OrePrefixes.plate.get(Materials.NaquadahAlloy) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(38L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Neutronium), 'Y', + OrePrefixes.plate.get(Materials.EnergeticAlloy), 'Z', + OrePrefixes.plate.get(Materials.Draconium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(40L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.BlackPlutonium), 'Y', + OrePrefixes.plate.get(Materials.Sunnarium), 'Z', OrePrefixes.plate.get(Materials.Naquadah) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(42L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.BlackPlutonium), 'Y', + OrePrefixes.plate.get(Materials.Sunnarium), 'Z', + OrePrefixes.plate.get(Materials.NaquadahAlloy) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(44L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.BlackPlutonium), 'Y', + OrePrefixes.plate.get(Materials.Sunnarium), 'Z', OrePrefixes.plate.get(Materials.Draconium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(48L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.DraconiumAwakened), 'Y', + OrePrefixes.plate.get(Materials.Neutronium), 'Z', OrePrefixes.plate.get(Materials.HSSS) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(52L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.DraconiumAwakened), 'Y', + OrePrefixes.plate.get(Materials.Neutronium), 'Z', OrePrefixes.plate.get(Materials.Naquadah) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(56L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.DraconiumAwakened), 'Y', + OrePrefixes.plate.get(Materials.Neutronium), 'Z', + OrePrefixes.plate.get(Materials.NaquadahAlloy) }); + GT_ModHandler.addCraftingRecipe( + ItemList.IC2_Mixed_Metal_Ingot.get(64L), + bits_no_remove_buffered, + new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.DraconiumAwakened), 'Y', + OrePrefixes.plate.get(Materials.Neutronium), 'Z', + OrePrefixes.plate.get(Materials.BlackPlutonium) }); GT_Log.out.println("GT_Mod: Beginning to add regular Crafting Recipes."); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("scaffold", 4L), bits_no_remove_buffered, new Object[] { - "WWW", - " S ", - "S S", - 'W', - OrePrefixes.plank.get(Materials.Wood), - 'S', - OrePrefixes.stick.get(Materials.Wood) - }); + GT_ModHandler.getIC2Item("scaffold", 4L), + bits_no_remove_buffered, + new Object[] { "WWW", " S ", "S S", 'W', OrePrefixes.plank.get(Materials.Wood), 'S', + OrePrefixes.stick.get(Materials.Wood) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.stick.get(Materials.AnyIron), - OrePrefixes.dust.get(Materials.Redstone), - OrePrefixes.dust.get(Materials.Redstone), - OrePrefixes.dust.get(Materials.Redstone), - OrePrefixes.dust.get(Materials.Redstone) - }); + new Object[] { OrePrefixes.stick.get(Materials.AnyIron), OrePrefixes.dust.get(Materials.Redstone), + OrePrefixes.dust.get(Materials.Redstone), OrePrefixes.dust.get(Materials.Redstone), + OrePrefixes.dust.get(Materials.Redstone) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Paper, 1L), bits_no_remove_buffered, - new Object[] {"PPk", 'P', OrePrefixes.plate.get(Materials.Paper)}); - - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.torch, 2), bits_no_remove_buffered, new Object[] { - "C", "S", 'C', OrePrefixes.dust.get(Materials.Sulfur), 'S', OrePrefixes.stick.get(Materials.Wood) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.torch, 6), bits_no_remove_buffered, new Object[] { - "C", - "S", - 'C', - OrePrefixes.dust.get(Materials.TricalciumPhosphate), - 'S', - OrePrefixes.stick.get(Materials.Wood) - }); - - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.piston, 1), bits_no_remove_buffered, new Object[] { - "WWW", - "CBC", - "CRC", - 'W', - OrePrefixes.plank.get(Materials.Wood), - 'C', - OrePrefixes.stoneCobble, - 'R', - OrePrefixes.dust.get(Materials.Redstone), - 'B', - OrePrefixes.ingot.get(Materials.AnyIron) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.piston, 1), bits_no_remove_buffered, new Object[] { - "WWW", - "CBC", - "CRC", - 'W', - OrePrefixes.plank.get(Materials.Wood), - 'C', - OrePrefixes.stoneCobble, - 'R', - OrePrefixes.dust.get(Materials.Redstone), - 'B', - OrePrefixes.ingot.get(Materials.AnyBronze) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.piston, 1), bits_no_remove_buffered, new Object[] { - "WWW", - "CBC", - "CRC", - 'W', - OrePrefixes.plank.get(Materials.Wood), - 'C', - OrePrefixes.stoneCobble, - 'R', - OrePrefixes.dust.get(Materials.Redstone), - 'B', - OrePrefixes.ingot.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.piston, 1), bits_no_remove_buffered, new Object[] { - "WWW", - "CBC", - "CRC", - 'W', - OrePrefixes.plank.get(Materials.Wood), - 'C', - OrePrefixes.stoneCobble, - 'R', - OrePrefixes.dust.get(Materials.Redstone), - 'B', - OrePrefixes.ingot.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.piston, 1), bits_no_remove_buffered, new Object[] { - "WWW", - "CBC", - "CRC", - 'W', - OrePrefixes.plank.get(Materials.Wood), - 'C', - OrePrefixes.stoneCobble, - 'R', - OrePrefixes.dust.get(Materials.Redstone), - 'B', - OrePrefixes.ingot.get(Materials.Titanium) - }); - - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("reactorVent", 1L, 1), bits_no_remove_buffered, new Object[] { - "AIA", - "I I", - "AIA", - 'I', - new ItemStack(Blocks.iron_bars, 1), - 'A', - OrePrefixes.plate.get(Materials.Aluminium) - }); + new Object[] { "PPk", 'P', OrePrefixes.plate.get(Materials.Paper) }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.torch, 2), + bits_no_remove_buffered, + new Object[] { "C", "S", 'C', OrePrefixes.dust.get(Materials.Sulfur), 'S', + OrePrefixes.stick.get(Materials.Wood) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.torch, 6), + bits_no_remove_buffered, + new Object[] { "C", "S", 'C', OrePrefixes.dust.get(Materials.TricalciumPhosphate), 'S', + OrePrefixes.stick.get(Materials.Wood) }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.piston, 1), + bits_no_remove_buffered, + new Object[] { "WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C', + OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B', + OrePrefixes.ingot.get(Materials.AnyIron) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.piston, 1), + bits_no_remove_buffered, + new Object[] { "WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C', + OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B', + OrePrefixes.ingot.get(Materials.AnyBronze) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.piston, 1), + bits_no_remove_buffered, + new Object[] { "WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C', + OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B', + OrePrefixes.ingot.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.piston, 1), + bits_no_remove_buffered, + new Object[] { "WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C', + OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B', + OrePrefixes.ingot.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Blocks.piston, 1), + bits_no_remove_buffered, + new Object[] { "WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C', + OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B', + OrePrefixes.ingot.get(Materials.Titanium) }); + + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("reactorVent", 1L, 1), + bits_no_remove_buffered, + new Object[] { "AIA", "I I", "AIA", 'I', new ItemStack(Blocks.iron_bars, 1), 'A', + OrePrefixes.plate.get(Materials.Aluminium) }); GT_ModHandler.addShapelessCraftingRecipe( GT_ModHandler.getIC2Item("reactorPlatingExplosive", 1L), bits_no_remove_buffered, - new Object[] {GT_ModHandler.getIC2Item("reactorPlating", 1L), OrePrefixes.plate.get(Materials.Lead)}); + new Object[] { GT_ModHandler.getIC2Item("reactorPlating", 1L), OrePrefixes.plate.get(Materials.Lead) }); if (!Materials.Steel.mBlastFurnaceRequired) { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Iron), - OrePrefixes.dust.get(Materials.Coal), - OrePrefixes.dust.get(Materials.Coal) - }); + new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Coal), + OrePrefixes.dust.get(Materials.Coal) }); } if (GT_Mod.gregtechproxy.mNerfDustCrafting) { // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustTiny, @@ -2065,7 +1385,7 @@ public class GT_CraftingRecipeLoader implements Runnable { // OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.Manganese), // OrePrefixes.dust.get(Materials.Chrome)}); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, - // Materials.TungstenSteel, 7L), bits_no_remove_buffered, new + // Materials.TungstenSteel, 7L), bits_no_remove_buffered, new // Object[]{OrePrefixes.dust.get(Materials.Tungsten),OrePrefixes.dust.get(Materials.Steel)}); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, // Materials.TungstenCarbide, 7L), bits_no_remove_buffered, new @@ -2077,7 +1397,7 @@ public class GT_CraftingRecipeLoader implements Runnable { // Materials.NiobiumTitanium, 7L), bits_no_remove_buffered, new // Object[]{OrePrefixes.dust.get(Materials.Niobium),OrePrefixes.dust.get(Materials.Titanium)}); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, - // Materials.Osmiridium, 15L), bits_no_remove_buffered, new + // Materials.Osmiridium, 15L), bits_no_remove_buffered, new // Object[]{OrePrefixes.dust.get(Materials.Osmium),OrePrefixes.dust.get(Materials.Iridium),OrePrefixes.dust.get(Materials.Iridium),OrePrefixes.dust.get(Materials.Iridium)}); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, // Materials.Electrum, 6L), bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.Silver), @@ -2086,51 +1406,34 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 3L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.Zinc) - }); + new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), + OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Zinc) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Brass, 9L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Zinc) - }); + new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), + OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite), + OrePrefixes.dust.get(Materials.Zinc) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 3L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.Tin) - }); + new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), + OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Tin) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Bronze, 9L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tin) - }); + new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), + OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite), + OrePrefixes.dust.get(Materials.Tin) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Invar, 9L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Iron), - OrePrefixes.dust.get(Materials.Iron), - OrePrefixes.dust.get(Materials.Nickel) - }); + new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Iron), + OrePrefixes.dust.get(Materials.Nickel) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cupronickel, 6L), bits_no_remove_buffered, - new Object[] {OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.AnyCopper)}); + new Object[] { OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.AnyCopper) }); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, // Materials.Nichrome, 15L), bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.Nickel), // OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.Nickel), @@ -2179,7 +1482,7 @@ public class GT_CraftingRecipeLoader implements Runnable { // OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.Manganese), // OrePrefixes.dust.get(Materials.Chrome)}); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, - // Materials.TungstenSteel, 2L), bits_no_remove_buffered, new + // Materials.TungstenSteel, 2L), bits_no_remove_buffered, new // Object[]{OrePrefixes.dust.get(Materials.Tungsten),OrePrefixes.dust.get(Materials.Steel)}); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, // Materials.TungstenCarbide, 2L), bits_no_remove_buffered, new @@ -2191,7 +1494,7 @@ public class GT_CraftingRecipeLoader implements Runnable { // Materials.NiobiumTitanium, 2L), bits_no_remove_buffered, new // Object[]{OrePrefixes.dust.get(Materials.Niobium),OrePrefixes.dust.get(Materials.Titanium)}); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmiridium, - // 4L), bits_no_remove_buffered, new + // 4L), bits_no_remove_buffered, new // Object[]{OrePrefixes.dust.get(Materials.Osmium),OrePrefixes.dust.get(Materials.Iridium),OrePrefixes.dust.get(Materials.Iridium),OrePrefixes.dust.get(Materials.Iridium)}); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Electrum, // 2L), bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.Silver), @@ -2199,51 +1502,34 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 4L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.Zinc) - }); + new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), + OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Zinc) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 3L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Zinc) - }); + new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), + OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite), + OrePrefixes.dust.get(Materials.Zinc) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 4L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.Tin) - }); + new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), + OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Tin) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 3L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tin) - }); + new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), + OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite), + OrePrefixes.dust.get(Materials.Tin) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Invar, 3L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Iron), - OrePrefixes.dust.get(Materials.Iron), - OrePrefixes.dust.get(Materials.Nickel) - }); + new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Iron), + OrePrefixes.dust.get(Materials.Nickel) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 2L), bits_no_remove_buffered, - new Object[] {OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.AnyCopper)}); + new Object[] { OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.AnyCopper) }); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, // 5L), bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.Nickel), // OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.Nickel), @@ -2252,43 +1538,27 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RoseGold, 4L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Gold), - OrePrefixes.dust.get(Materials.Gold), - OrePrefixes.dust.get(Materials.Gold), - OrePrefixes.dust.get(Materials.Gold), - OrePrefixes.dust.get(Materials.AnyCopper) - }); + new Object[] { OrePrefixes.dust.get(Materials.Gold), OrePrefixes.dust.get(Materials.Gold), + OrePrefixes.dust.get(Materials.Gold), OrePrefixes.dust.get(Materials.Gold), + OrePrefixes.dust.get(Materials.AnyCopper) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SterlingSilver, 4L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Silver), - OrePrefixes.dust.get(Materials.Silver), - OrePrefixes.dust.get(Materials.Silver), - OrePrefixes.dust.get(Materials.Silver), - OrePrefixes.dust.get(Materials.AnyCopper) - }); + new Object[] { OrePrefixes.dust.get(Materials.Silver), OrePrefixes.dust.get(Materials.Silver), + OrePrefixes.dust.get(Materials.Silver), OrePrefixes.dust.get(Materials.Silver), + OrePrefixes.dust.get(Materials.AnyCopper) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackBronze, 4L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Gold), - OrePrefixes.dust.get(Materials.Silver), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper) - }); + new Object[] { OrePrefixes.dust.get(Materials.Gold), OrePrefixes.dust.get(Materials.Silver), + OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), + OrePrefixes.dust.get(Materials.AnyCopper) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BismuthBronze, 4L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Bismuth), - OrePrefixes.dust.get(Materials.Zinc), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper) - }); + new Object[] { OrePrefixes.dust.get(Materials.Bismuth), OrePrefixes.dust.get(Materials.Zinc), + OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), + OrePrefixes.dust.get(Materials.AnyCopper) }); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, // 4L), bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.Nickel), // OrePrefixes.dust.get(Materials.BlackBronze), OrePrefixes.dust.get(Materials.Steel), @@ -2315,17 +1585,11 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CobaltBrass, 8L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Brass), - OrePrefixes.dust.get(Materials.Brass), - OrePrefixes.dust.get(Materials.Brass), - OrePrefixes.dust.get(Materials.Brass), - OrePrefixes.dust.get(Materials.Brass), - OrePrefixes.dust.get(Materials.Brass), - OrePrefixes.dust.get(Materials.Brass), - OrePrefixes.dust.get(Materials.Aluminium), - OrePrefixes.dust.get(Materials.Cobalt) - }); + new Object[] { OrePrefixes.dust.get(Materials.Brass), OrePrefixes.dust.get(Materials.Brass), + OrePrefixes.dust.get(Materials.Brass), OrePrefixes.dust.get(Materials.Brass), + OrePrefixes.dust.get(Materials.Brass), OrePrefixes.dust.get(Materials.Brass), + OrePrefixes.dust.get(Materials.Brass), OrePrefixes.dust.get(Materials.Aluminium), + OrePrefixes.dust.get(Materials.Cobalt) }); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 3L), // bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.Iron), // OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Chrome)}); @@ -2348,83 +1612,52 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DamascusSteel, 2L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Steel), - OrePrefixes.dustSmall.get(Materials.Nickel), - OrePrefixes.dustSmall.get(Materials.Nickel), - OrePrefixes.dustSmall.get(Materials.Nickel), - OrePrefixes.dustTiny.get(Materials.Coal), - OrePrefixes.dustTiny.get(Materials.Silicon), - OrePrefixes.dustTiny.get(Materials.Manganese), - OrePrefixes.dustTiny.get(Materials.Chrome), - OrePrefixes.dustTiny.get(Materials.Molybdenum) - }); + new Object[] { OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dustSmall.get(Materials.Nickel), + OrePrefixes.dustSmall.get(Materials.Nickel), OrePrefixes.dustSmall.get(Materials.Nickel), + OrePrefixes.dustTiny.get(Materials.Coal), OrePrefixes.dustTiny.get(Materials.Silicon), + OrePrefixes.dustTiny.get(Materials.Manganese), OrePrefixes.dustTiny.get(Materials.Chrome), + OrePrefixes.dustTiny.get(Materials.Molybdenum) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DamascusSteel, 2L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Steel), - OrePrefixes.dustSmall.get(Materials.Manganese), - OrePrefixes.dustSmall.get(Materials.Manganese), - OrePrefixes.dustSmall.get(Materials.Chrome), - OrePrefixes.dustSmall.get(Materials.Chrome), - OrePrefixes.dustTiny.get(Materials.Coal), - OrePrefixes.dustTiny.get(Materials.Silicon), - OrePrefixes.dustTiny.get(Materials.Vanadium) - }); + new Object[] { OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dustSmall.get(Materials.Manganese), + OrePrefixes.dustSmall.get(Materials.Manganese), OrePrefixes.dustSmall.get(Materials.Chrome), + OrePrefixes.dustSmall.get(Materials.Chrome), OrePrefixes.dustTiny.get(Materials.Coal), + OrePrefixes.dustTiny.get(Materials.Silicon), OrePrefixes.dustTiny.get(Materials.Vanadium) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSLA, 2L), bits_no_remove_buffered, new Object[] { - OrePrefixes.dust.get(Materials.Steel), - OrePrefixes.dustSmall.get(Materials.Niobium), - OrePrefixes.dustSmall.get(Materials.AnnealedCopper), - OrePrefixes.dustSmall.get(Materials.Nickel), - OrePrefixes.dustSmall.get(Materials.Vanadium), - OrePrefixes.dustSmall.get(Materials.Chrome), - OrePrefixes.dustTiny.get(Materials.Molybdenum), - OrePrefixes.dustSmall.get(Materials.Titanium), - OrePrefixes.dustTiny.get(Materials.Carbon) - }); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSLA, 2L), + bits_no_remove_buffered, + new Object[] { OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dustSmall.get(Materials.Niobium), + OrePrefixes.dustSmall.get(Materials.AnnealedCopper), + OrePrefixes.dustSmall.get(Materials.Nickel), OrePrefixes.dustSmall.get(Materials.Vanadium), + OrePrefixes.dustSmall.get(Materials.Chrome), OrePrefixes.dustTiny.get(Materials.Molybdenum), + OrePrefixes.dustSmall.get(Materials.Titanium), OrePrefixes.dustTiny.get(Materials.Carbon) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RedstoneAlloy, 2L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Redstone), - OrePrefixes.dust.get(Materials.Silicon), - OrePrefixes.dust.get(Materials.Coal) - }); + new Object[] { OrePrefixes.dust.get(Materials.Redstone), OrePrefixes.dust.get(Materials.Silicon), + OrePrefixes.dust.get(Materials.Coal) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CrudeSteel, 2L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Clay), - OrePrefixes.dust.get(Materials.Flint), - OrePrefixes.dust.get(Materials.Stone) - }); + new Object[] { OrePrefixes.dust.get(Materials.Clay), OrePrefixes.dust.get(Materials.Flint), + OrePrefixes.dust.get(Materials.Stone) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ConductiveIron, 2L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.RedstoneAlloy), - OrePrefixes.dust.get(Materials.Iron), - OrePrefixes.dust.get(Materials.Silver) - }); + new Object[] { OrePrefixes.dust.get(Materials.RedstoneAlloy), OrePrefixes.dust.get(Materials.Iron), + OrePrefixes.dust.get(Materials.Silver) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnergeticAlloy, 2L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.ConductiveIron), - OrePrefixes.dust.get(Materials.Gold), - OrePrefixes.dust.get(Materials.BlackSteel) - }); + new Object[] { OrePrefixes.dust.get(Materials.ConductiveIron), OrePrefixes.dust.get(Materials.Gold), + OrePrefixes.dust.get(Materials.BlackSteel) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnergeticSilver, 2L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.ConductiveIron), - OrePrefixes.dust.get(Materials.Silver), - OrePrefixes.dust.get(Materials.BlackSteel) - }); + new Object[] { OrePrefixes.dust.get(Materials.ConductiveIron), OrePrefixes.dust.get(Materials.Silver), + OrePrefixes.dust.get(Materials.BlackSteel) }); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.VibrantAlloy, // 2L), bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.EnergeticAlloy), // OrePrefixes.dust.get(Materials.EnderEye), OrePrefixes.dust.get(Materials.Chrome)}); @@ -2434,30 +1667,21 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectricalSteel, 2L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Steel), - OrePrefixes.dust.get(Materials.Coal), - OrePrefixes.dust.get(Materials.Silicon) - }); + new Object[] { OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dust.get(Materials.Coal), + OrePrefixes.dust.get(Materials.Silicon) }); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PulsatingIron, // 2L), bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.Iron), // OrePrefixes.dust.get(Materials.EnderPearl), OrePrefixes.dust.get(Materials.RedstoneAlloy)}); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soularium, 2L), bits_no_remove_buffered, - new Object[] { - new ItemStack(Blocks.soul_sand, 1, 32767), - OrePrefixes.dust.get(Materials.Gold), - OrePrefixes.dust.get(Materials.Ash) - }); + new Object[] { new ItemStack(Blocks.soul_sand, 1, 32767), OrePrefixes.dust.get(Materials.Gold), + OrePrefixes.dust.get(Materials.Ash) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkSteel, 2L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.ElectricalSteel), - OrePrefixes.dust.get(Materials.Coal), - OrePrefixes.dust.get(Materials.Obsidian) - }); + new Object[] { OrePrefixes.dust.get(Materials.ElectricalSteel), OrePrefixes.dust.get(Materials.Coal), + OrePrefixes.dust.get(Materials.Obsidian) }); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderiumBase, // 3L), bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.Tin), // OrePrefixes.dust.get(Materials.Tin), OrePrefixes.dust.get(Materials.Silver), @@ -2473,27 +1697,21 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manyullyn, 3L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Ardite), - OrePrefixes.dust.get(Materials.Ardite), - OrePrefixes.dust.get(Materials.Ardite), - OrePrefixes.dust.get(Materials.Ardite), - OrePrefixes.dust.get(Materials.Cobalt), - OrePrefixes.dust.get(Materials.Cobalt), - OrePrefixes.dust.get(Materials.Cobalt), - OrePrefixes.dust.get(Materials.Cobalt) - }); + new Object[] { OrePrefixes.dust.get(Materials.Ardite), OrePrefixes.dust.get(Materials.Ardite), + OrePrefixes.dust.get(Materials.Ardite), OrePrefixes.dust.get(Materials.Ardite), + OrePrefixes.dust.get(Materials.Cobalt), OrePrefixes.dust.get(Materials.Cobalt), + OrePrefixes.dust.get(Materials.Cobalt), OrePrefixes.dust.get(Materials.Cobalt) }); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.AstralSilver, // 1L), bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.Silver), // OrePrefixes.dust.get(Materials.Silver), OrePrefixes.dust.get(Materials.Thaumium)}); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Haderoth, 1L), bits_no_remove_buffered, - new Object[] {OrePrefixes.dust.get(Materials.Rubracium), OrePrefixes.dust.get(Materials.Mithril)}); + new Object[] { OrePrefixes.dust.get(Materials.Rubracium), OrePrefixes.dust.get(Materials.Mithril) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Celenegil, 1L), bits_no_remove_buffered, - new Object[] {OrePrefixes.dust.get(Materials.Platinum), OrePrefixes.dust.get(Materials.Orichalcum)}); + new Object[] { OrePrefixes.dust.get(Materials.Platinum), OrePrefixes.dust.get(Materials.Orichalcum) }); // GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.VanadiumSteel, // 9L), bits_no_remove_buffered, new Object[]{OrePrefixes.dust.get(Materials.Steel), @@ -2505,117 +1723,79 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 2L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Iron), - OrePrefixes.dust.get(Materials.LiveRoot), - OrePrefixes.dustTiny.get(Materials.Gold) - }); + new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.LiveRoot), + OrePrefixes.dustTiny.get(Materials.Gold) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Hepatizon, 3L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Copper), - OrePrefixes.dust.get(Materials.Copper), - OrePrefixes.dust.get(Materials.Copper), - OrePrefixes.dustTiny.get(Materials.Gold), - OrePrefixes.dustTiny.get(Materials.Gold), - OrePrefixes.dustTiny.get(Materials.Gold), - OrePrefixes.dustTiny.get(Materials.Silver), - OrePrefixes.dustTiny.get(Materials.Silver), - OrePrefixes.dustTiny.get(Materials.Silver) - }); + new Object[] { OrePrefixes.dust.get(Materials.Copper), OrePrefixes.dust.get(Materials.Copper), + OrePrefixes.dust.get(Materials.Copper), OrePrefixes.dustTiny.get(Materials.Gold), + OrePrefixes.dustTiny.get(Materials.Gold), OrePrefixes.dustTiny.get(Materials.Gold), + OrePrefixes.dustTiny.get(Materials.Silver), OrePrefixes.dustTiny.get(Materials.Silver), + OrePrefixes.dustTiny.get(Materials.Silver) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Angmallen, 2L), bits_no_remove_buffered, - new Object[] {OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Gold)}); + new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Gold) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Inolashite, 1L), bits_no_remove_buffered, - new Object[] {OrePrefixes.dust.get(Materials.Alduorite), OrePrefixes.dust.get(Materials.Ceruclase)}); + new Object[] { OrePrefixes.dust.get(Materials.Alduorite), OrePrefixes.dust.get(Materials.Ceruclase) }); GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Items.gunpowder, 6), bits_no_remove_buffered, new Object[] { - OrePrefixes.dust.get(Materials.Coal), - OrePrefixes.dust.get(Materials.Coal), - OrePrefixes.dust.get(Materials.Coal), - OrePrefixes.dust.get(Materials.Sulfur), - OrePrefixes.dust.get(Materials.Saltpeter), - OrePrefixes.dust.get(Materials.Saltpeter) - }); + new ItemStack(Items.gunpowder, 6), + bits_no_remove_buffered, + new Object[] { OrePrefixes.dust.get(Materials.Coal), OrePrefixes.dust.get(Materials.Coal), + OrePrefixes.dust.get(Materials.Coal), OrePrefixes.dust.get(Materials.Sulfur), + OrePrefixes.dust.get(Materials.Saltpeter), OrePrefixes.dust.get(Materials.Saltpeter) }); GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Items.gunpowder, 6), bits_no_remove_buffered, new Object[] { - OrePrefixes.dust.get(Materials.Charcoal), - OrePrefixes.dust.get(Materials.Charcoal), - OrePrefixes.dust.get(Materials.Charcoal), - OrePrefixes.dust.get(Materials.Sulfur), - OrePrefixes.dust.get(Materials.Saltpeter), - OrePrefixes.dust.get(Materials.Saltpeter) - }); + new ItemStack(Items.gunpowder, 6), + bits_no_remove_buffered, + new Object[] { OrePrefixes.dust.get(Materials.Charcoal), OrePrefixes.dust.get(Materials.Charcoal), + OrePrefixes.dust.get(Materials.Charcoal), OrePrefixes.dust.get(Materials.Sulfur), + OrePrefixes.dust.get(Materials.Saltpeter), OrePrefixes.dust.get(Materials.Saltpeter) }); GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Items.gunpowder, 6), bits_no_remove_buffered, new Object[] { - OrePrefixes.dust.get(Materials.Carbon), - OrePrefixes.dust.get(Materials.Carbon), - OrePrefixes.dust.get(Materials.Carbon), - OrePrefixes.dust.get(Materials.Sulfur), - OrePrefixes.dust.get(Materials.Saltpeter), - OrePrefixes.dust.get(Materials.Saltpeter) - }); + new ItemStack(Items.gunpowder, 6), + bits_no_remove_buffered, + new Object[] { OrePrefixes.dust.get(Materials.Carbon), OrePrefixes.dust.get(Materials.Carbon), + OrePrefixes.dust.get(Materials.Carbon), OrePrefixes.dust.get(Materials.Sulfur), + OrePrefixes.dust.get(Materials.Saltpeter), OrePrefixes.dust.get(Materials.Saltpeter) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 3L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Indium), - OrePrefixes.dust.get(Materials.Gallium), - OrePrefixes.dust.get(Materials.Phosphorus) - }); + new Object[] { OrePrefixes.dust.get(Materials.Indium), OrePrefixes.dust.get(Materials.Gallium), + OrePrefixes.dust.get(Materials.Phosphorus) }); GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 5L), bits_no_remove_buffered, - new Object[] { - OrePrefixes.dust.get(Materials.Potassium), - OrePrefixes.cell.get(Materials.Nitrogen), - OrePrefixes.cell.get(Materials.Oxygen), - OrePrefixes.cell.get(Materials.Oxygen), - OrePrefixes.cell.get(Materials.Oxygen) - }); + new Object[] { OrePrefixes.dust.get(Materials.Potassium), OrePrefixes.cell.get(Materials.Nitrogen), + OrePrefixes.cell.get(Materials.Oxygen), OrePrefixes.cell.get(Materials.Oxygen), + OrePrefixes.cell.get(Materials.Oxygen) }); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("carbonFiber", 1L)); - ItemStack[] tChestAndTank = new ItemStack[] { - ItemList.Super_Chest_EV.get(1), ItemList.Super_Chest_IV.get(1), ItemList.Super_Chest_HV.get(1), - ItemList.Super_Chest_MV.get(1), ItemList.Super_Chest_LV.get(1), - ItemList.Quantum_Chest_EV.get(1), ItemList.Quantum_Chest_IV.get(1), ItemList.Quantum_Chest_HV.get(1), - ItemList.Quantum_Chest_MV.get(1), ItemList.Quantum_Chest_LV.get(1), - ItemList.Super_Tank_EV.get(1), ItemList.Super_Tank_IV.get(1), ItemList.Super_Tank_HV.get(1), - ItemList.Super_Tank_MV.get(1), ItemList.Super_Tank_LV.get(1), - ItemList.Quantum_Tank_EV.get(1), ItemList.Quantum_Tank_IV.get(1), ItemList.Quantum_Tank_HV.get(1), - ItemList.Quantum_Tank_MV.get(1), ItemList.Quantum_Tank_LV.get(1) - }; + ItemStack[] tChestAndTank = new ItemStack[] { ItemList.Super_Chest_EV.get(1), ItemList.Super_Chest_IV.get(1), + ItemList.Super_Chest_HV.get(1), ItemList.Super_Chest_MV.get(1), ItemList.Super_Chest_LV.get(1), + ItemList.Quantum_Chest_EV.get(1), ItemList.Quantum_Chest_IV.get(1), ItemList.Quantum_Chest_HV.get(1), + ItemList.Quantum_Chest_MV.get(1), ItemList.Quantum_Chest_LV.get(1), ItemList.Super_Tank_EV.get(1), + ItemList.Super_Tank_IV.get(1), ItemList.Super_Tank_HV.get(1), ItemList.Super_Tank_MV.get(1), + ItemList.Super_Tank_LV.get(1), ItemList.Quantum_Tank_EV.get(1), ItemList.Quantum_Tank_IV.get(1), + ItemList.Quantum_Tank_HV.get(1), ItemList.Quantum_Tank_MV.get(1), ItemList.Quantum_Tank_LV.get(1) }; for (ItemStack tItem : tChestAndTank) { - GT_ModHandler.addShapelessCraftingRecipe(tItem, new Object[] {tItem}); + GT_ModHandler.addShapelessCraftingRecipe(tItem, new Object[] { tItem }); } if (GT_Mod.gregtechproxy.mDisableIC2Cables) { - List<ItemStack> iToRemoveAndHide = Arrays.stream(new String[] { - "copperCableItem", - "insulatedCopperCableItem", - "goldCableItem", - "insulatedGoldCableItem", - "insulatedIronCableItem", - "glassFiberCableItem", - "tinCableItem", - "ironCableItem", - "insulatedTinCableItem", - "detectorCableItem", - "splitterCableItem", - "electrolyzer", - "cutter" - }) - .map(x -> GT_ModHandler.getIC2Item(x, 1L)) - .collect(Collectors.toList()); + List<ItemStack> iToRemoveAndHide = Arrays + .stream( + new String[] { "copperCableItem", "insulatedCopperCableItem", "goldCableItem", + "insulatedGoldCableItem", "insulatedIronCableItem", "glassFiberCableItem", + "tinCableItem", "ironCableItem", "insulatedTinCableItem", "detectorCableItem", + "splitterCableItem", "electrolyzer", "cutter" }) + .map(x -> GT_ModHandler.getIC2Item(x, 1L)).collect(Collectors.toList()); if (Loader.isModLoaded("NotEnoughItems")) { iToRemoveAndHide.forEach(item -> { @@ -2624,403 +1804,182 @@ public class GT_CraftingRecipeLoader implements Runnable { }); } - Arrays.stream(new String[] { - "batBox", - "mfeUnit", - "lvTransformer", - "mvTransformer", - "hvTransformer", - "evTransformer", - "cesuUnit", - "luminator", - "teleporter", - "energyOMat", - "advBattery", - "boatElectric", - "cropnalyzer", - "coil", - "powerunit", - "powerunitsmall", - "remote", - "odScanner", - "ovScanner", - "solarHelmet", - "staticBoots", - "ecMeter", - "obscurator", - "overclockerUpgrade", - "transformerUpgrade", - "energyStorageUpgrade", - "ejectorUpgrade", - "suBattery", - "frequencyTransmitter", - "pullingUpgrade" - }) - .map(x -> GT_ModHandler.getIC2Item(x, 1L)) - .forEach(GT_ModHandler::removeRecipeByOutputDelayed); + Arrays.stream( + new String[] { "batBox", "mfeUnit", "lvTransformer", "mvTransformer", "hvTransformer", + "evTransformer", "cesuUnit", "luminator", "teleporter", "energyOMat", "advBattery", + "boatElectric", "cropnalyzer", "coil", "powerunit", "powerunitsmall", "remote", "odScanner", + "ovScanner", "solarHelmet", "staticBoots", "ecMeter", "obscurator", "overclockerUpgrade", + "transformerUpgrade", "energyStorageUpgrade", "ejectorUpgrade", "suBattery", + "frequencyTransmitter", "pullingUpgrade" }) + .map(x -> GT_ModHandler.getIC2Item(x, 1L)).forEach(GT_ModHandler::removeRecipeByOutputDelayed); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("batBox", 1L), bits_no_remove_buffered, new Object[] { - "PCP", - "BBB", - "PPP", - 'C', - OrePrefixes.cableGt01.get(Materials.Tin), - 'P', - OrePrefixes.plank.get(Materials.Wood), - 'B', - OrePrefixes.battery.get(Materials.Basic) - }); + GT_ModHandler.getIC2Item("batBox", 1L), + bits_no_remove_buffered, + new Object[] { "PCP", "BBB", "PPP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'P', + OrePrefixes.plank.get(Materials.Wood), 'B', OrePrefixes.battery.get(Materials.Basic) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("mfeUnit", 1L), bits_no_remove_buffered, new Object[] { - "CEC", - "EME", - "CEC", - 'C', - OrePrefixes.cableGt01.get(Materials.Gold), - 'E', - OrePrefixes.battery.get(Materials.Elite), - 'M', - GT_ModHandler.getIC2Item("machine", 1L) - }); + GT_ModHandler.getIC2Item("mfeUnit", 1L), + bits_no_remove_buffered, + new Object[] { "CEC", "EME", "CEC", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'E', + OrePrefixes.battery.get(Materials.Elite), 'M', GT_ModHandler.getIC2Item("machine", 1L) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("lvTransformer", 1L), bits_no_remove_buffered, new Object[] { - "PCP", - "POP", - "PCP", - 'C', - OrePrefixes.cableGt01.get(Materials.Tin), - 'O', - GT_ModHandler.getIC2Item("coil", 1L), - 'P', - OrePrefixes.plank.get(Materials.Wood) - }); + GT_ModHandler.getIC2Item("lvTransformer", 1L), + bits_no_remove_buffered, + new Object[] { "PCP", "POP", "PCP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'O', + GT_ModHandler.getIC2Item("coil", 1L), 'P', OrePrefixes.plank.get(Materials.Wood) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("mvTransformer", 1L), bits_no_remove_buffered, new Object[] { - "CMC", - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'M', - GT_ModHandler.getIC2Item("machine", 1L) - }); + GT_ModHandler.getIC2Item("mvTransformer", 1L), + bits_no_remove_buffered, + new Object[] { "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'M', + GT_ModHandler.getIC2Item("machine", 1L) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("hvTransformer", 1L), bits_no_remove_buffered, new Object[] { - " C ", - "IMB", - " C ", - 'C', - OrePrefixes.cableGt01.get(Materials.Gold), - 'M', - GT_ModHandler.getIC2Item("mvTransformer", 1L), - 'I', - OrePrefixes.circuit.get(Materials.Basic), - 'B', - OrePrefixes.battery.get(Materials.Advanced) - }); + GT_ModHandler.getIC2Item("hvTransformer", 1L), + bits_no_remove_buffered, + new Object[] { " C ", "IMB", " C ", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'M', + GT_ModHandler.getIC2Item("mvTransformer", 1L), 'I', + OrePrefixes.circuit.get(Materials.Basic), 'B', + OrePrefixes.battery.get(Materials.Advanced) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("evTransformer", 1L), bits_no_remove_buffered, new Object[] { - " C ", - "IMB", - " C ", - 'C', - OrePrefixes.cableGt01.get(Materials.Aluminium), - 'M', - GT_ModHandler.getIC2Item("hvTransformer", 1L), - 'I', - OrePrefixes.circuit.get(Materials.Advanced), - 'B', - OrePrefixes.battery.get(Materials.Master) - }); + GT_ModHandler.getIC2Item("evTransformer", 1L), + bits_no_remove_buffered, + new Object[] { " C ", "IMB", " C ", 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'M', + GT_ModHandler.getIC2Item("hvTransformer", 1L), 'I', + OrePrefixes.circuit.get(Materials.Advanced), 'B', + OrePrefixes.battery.get(Materials.Master) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("cesuUnit", 1L), bits_no_remove_buffered, new Object[] { - "PCP", - "BBB", - "PPP", - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'P', - OrePrefixes.plate.get(Materials.Bronze), - 'B', - OrePrefixes.battery.get(Materials.Advanced) - }); + GT_ModHandler.getIC2Item("cesuUnit", 1L), + bits_no_remove_buffered, + new Object[] { "PCP", "BBB", "PPP", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'P', + OrePrefixes.plate.get(Materials.Bronze), 'B', + OrePrefixes.battery.get(Materials.Advanced) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("teleporter", 1L), bits_no_remove_buffered, new Object[] { - "GFG", - "CMC", - "GDG", - 'C', - OrePrefixes.cableGt01.get(Materials.Platinum), - 'G', - OrePrefixes.circuit.get(Materials.Advanced), - 'D', - OrePrefixes.gem.get(Materials.Diamond), - 'M', - GT_ModHandler.getIC2Item("machine", 1L), - 'F', - GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) - }); + GT_ModHandler.getIC2Item("teleporter", 1L), + bits_no_remove_buffered, + new Object[] { "GFG", "CMC", "GDG", 'C', OrePrefixes.cableGt01.get(Materials.Platinum), 'G', + OrePrefixes.circuit.get(Materials.Advanced), 'D', OrePrefixes.gem.get(Materials.Diamond), + 'M', GT_ModHandler.getIC2Item("machine", 1L), 'F', + GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("energyOMat", 1L), bits_no_remove_buffered, new Object[] { - "RBR", - "CMC", - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'R', - OrePrefixes.dust.get(Materials.Redstone), - 'B', - OrePrefixes.battery.get(Materials.Basic), - 'M', - GT_ModHandler.getIC2Item("machine", 1L) - }); + GT_ModHandler.getIC2Item("energyOMat", 1L), + bits_no_remove_buffered, + new Object[] { "RBR", "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'R', + OrePrefixes.dust.get(Materials.Redstone), 'B', OrePrefixes.battery.get(Materials.Basic), + 'M', GT_ModHandler.getIC2Item("machine", 1L) }); // GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("advBattery", 1L), bits_no_remove_buffered, new // Object[]{"CTC", "TST", "TLT", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'S', // OrePrefixes.dust.get(Materials.Sulfur), 'L', OrePrefixes.dust.get(Materials.Lead), 'T', // GT_ModHandler.getIC2Item("casingbronze", 1L)}); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("boatElectric", 1L), bits_no_remove_buffered, new Object[] { - "CCC", - "XWX", - aTextIron2, - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'X', - OrePrefixes.plate.get(Materials.Iron), - 'W', - GT_ModHandler.getIC2Item("waterMill", 1L) - }); + GT_ModHandler.getIC2Item("boatElectric", 1L), + bits_no_remove_buffered, + new Object[] { "CCC", "XWX", aTextIron2, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'X', + OrePrefixes.plate.get(Materials.Iron), 'W', GT_ModHandler.getIC2Item("waterMill", 1L) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("cropnalyzer", 1L), bits_no_remove_buffered, new Object[] { - "CC ", - "RGR", - "RIR", - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'R', - OrePrefixes.dust.get(Materials.Redstone), - 'G', - OrePrefixes.block.get(Materials.Glass), - 'I', - OrePrefixes.circuit.get(Materials.Basic) - }); + GT_ModHandler.getIC2Item("cropnalyzer", 1L), + bits_no_remove_buffered, + new Object[] { "CC ", "RGR", "RIR", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'R', + OrePrefixes.dust.get(Materials.Redstone), 'G', OrePrefixes.block.get(Materials.Glass), 'I', + OrePrefixes.circuit.get(Materials.Basic) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("coil", 1L), bits_no_remove_buffered, new Object[] { - "CCC", - "CXC", - "CCC", - 'C', - OrePrefixes.wireGt01.get(Materials.Copper), - 'X', - OrePrefixes.ingot.get(Materials.AnyIron) - }); + GT_ModHandler.getIC2Item("coil", 1L), + bits_no_remove_buffered, + new Object[] { "CCC", "CXC", "CCC", 'C', OrePrefixes.wireGt01.get(Materials.Copper), 'X', + OrePrefixes.ingot.get(Materials.AnyIron) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("powerunit", 1L), bits_no_remove_buffered, new Object[] { - "BCA", - "BIM", - "BCA", - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'B', - OrePrefixes.battery.get(Materials.Basic), - 'A', - GT_ModHandler.getIC2Item("casingiron", 1L), - 'I', - OrePrefixes.circuit.get(Materials.Basic), - 'M', - GT_ModHandler.getIC2Item("elemotor", 1L) - }); + GT_ModHandler.getIC2Item("powerunit", 1L), + bits_no_remove_buffered, + new Object[] { "BCA", "BIM", "BCA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B', + OrePrefixes.battery.get(Materials.Basic), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), + 'I', OrePrefixes.circuit.get(Materials.Basic), 'M', + GT_ModHandler.getIC2Item("elemotor", 1L) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("powerunitsmall", 1L), bits_no_remove_buffered, new Object[] { - " CA", - "BIM", - " CA", - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'B', - OrePrefixes.battery.get(Materials.Basic), - 'A', - GT_ModHandler.getIC2Item("casingiron", 1L), - 'I', - OrePrefixes.circuit.get(Materials.Basic), - 'M', - GT_ModHandler.getIC2Item("elemotor", 1L) - }); + GT_ModHandler.getIC2Item("powerunitsmall", 1L), + bits_no_remove_buffered, + new Object[] { " CA", "BIM", " CA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B', + OrePrefixes.battery.get(Materials.Basic), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), + 'I', OrePrefixes.circuit.get(Materials.Basic), 'M', + GT_ModHandler.getIC2Item("elemotor", 1L) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("remote", 1L), bits_no_remove_buffered, new Object[] { - " C ", - "TLT", - " F ", - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'L', - OrePrefixes.dust.get(Materials.Lapis), - 'T', - GT_ModHandler.getIC2Item("casingtin", 1L), - 'F', - GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) - }); + GT_ModHandler.getIC2Item("remote", 1L), + bits_no_remove_buffered, + new Object[] { " C ", "TLT", " F ", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'L', + OrePrefixes.dust.get(Materials.Lapis), 'T', GT_ModHandler.getIC2Item("casingtin", 1L), 'F', + GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("odScanner", 1L), bits_no_remove_buffered, new Object[] { - "PGP", - "CBC", - "WWW", - 'W', - OrePrefixes.cableGt01.get(Materials.Copper), - 'G', - OrePrefixes.dust.get(Materials.Glowstone), - 'B', - OrePrefixes.battery.get(Materials.Advanced), - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'P', - GT_ModHandler.getIC2Item("casinggold", 1L) - }); + GT_ModHandler.getIC2Item("odScanner", 1L), + bits_no_remove_buffered, + new Object[] { "PGP", "CBC", "WWW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'G', + OrePrefixes.dust.get(Materials.Glowstone), 'B', OrePrefixes.battery.get(Materials.Advanced), + 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', + GT_ModHandler.getIC2Item("casinggold", 1L) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("ovScanner", 1L), bits_no_remove_buffered, new Object[] { - "PDP", - "GCG", - "WSW", - 'W', - OrePrefixes.cableGt01.get(Materials.Gold), - 'G', - OrePrefixes.dust.get(Materials.Glowstone), - 'D', - OrePrefixes.battery.get(Materials.Elite), - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'P', - GT_ModHandler.getIC2Item("casinggold", 1L), - 'S', - GT_ModHandler.getIC2Item("odScanner", 1L) - }); + GT_ModHandler.getIC2Item("ovScanner", 1L), + bits_no_remove_buffered, + new Object[] { "PDP", "GCG", "WSW", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', + OrePrefixes.dust.get(Materials.Glowstone), 'D', OrePrefixes.battery.get(Materials.Elite), + 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', + GT_ModHandler.getIC2Item("casinggold", 1L), 'S', + GT_ModHandler.getIC2Item("odScanner", 1L) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("staticBoots", 1L), bits_no_remove_buffered, new Object[] { - "I I", - "IWI", - "CCC", - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'I', - OrePrefixes.ingot.get(Materials.Iron), - 'W', - new ItemStack(Blocks.wool) - }); + GT_ModHandler.getIC2Item("staticBoots", 1L), + bits_no_remove_buffered, + new Object[] { "I I", "IWI", "CCC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'I', + OrePrefixes.ingot.get(Materials.Iron), 'W', new ItemStack(Blocks.wool) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("ecMeter", 1L), bits_no_remove_buffered, new Object[] { - " G ", - "CIC", - "C C", - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'G', - OrePrefixes.dust.get(Materials.Glowstone), - 'I', - OrePrefixes.circuit.get(Materials.Basic) - }); + GT_ModHandler.getIC2Item("ecMeter", 1L), + bits_no_remove_buffered, + new Object[] { " G ", "CIC", "C C", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'G', + OrePrefixes.dust.get(Materials.Glowstone), 'I', OrePrefixes.circuit.get(Materials.Basic) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("obscurator", 1L), bits_no_remove_buffered, new Object[] { - "RER", - "CAC", - "RRR", - 'C', - OrePrefixes.cableGt01.get(Materials.Gold), - 'R', - OrePrefixes.dust.get(Materials.Redstone), - 'E', - OrePrefixes.battery.get(Materials.Advanced), - 'A', - OrePrefixes.circuit.get(Materials.Advanced) - }); + GT_ModHandler.getIC2Item("obscurator", 1L), + bits_no_remove_buffered, + new Object[] { "RER", "CAC", "RRR", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'R', + OrePrefixes.dust.get(Materials.Redstone), 'E', OrePrefixes.battery.get(Materials.Advanced), + 'A', OrePrefixes.circuit.get(Materials.Advanced) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("overclockerUpgrade", 1L), bits_no_remove_buffered, new Object[] { - "CCC", - "WEW", - 'W', - OrePrefixes.cableGt01.get(Materials.Copper), - 'C', - GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1), - 'E', - OrePrefixes.circuit.get(Materials.Basic) - }); + GT_ModHandler.getIC2Item("overclockerUpgrade", 1L), + bits_no_remove_buffered, + new Object[] { "CCC", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C', + GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1), 'E', + OrePrefixes.circuit.get(Materials.Basic) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("transformerUpgrade", 1L), bits_no_remove_buffered, new Object[] { - "GGG", - "WTW", - "GEG", - 'W', - OrePrefixes.cableGt01.get(Materials.Gold), - 'T', - GT_ModHandler.getIC2Item("mvTransformer", 1L), - 'E', - OrePrefixes.circuit.get(Materials.Basic), - 'G', - OrePrefixes.block.get(Materials.Glass) - }); + GT_ModHandler.getIC2Item("transformerUpgrade", 1L), + bits_no_remove_buffered, + new Object[] { "GGG", "WTW", "GEG", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'T', + GT_ModHandler.getIC2Item("mvTransformer", 1L), 'E', + OrePrefixes.circuit.get(Materials.Basic), 'G', OrePrefixes.block.get(Materials.Glass) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L), bits_no_remove_buffered, new Object[] { - "PPP", - "WBW", - "PEP", - 'W', - OrePrefixes.cableGt01.get(Materials.Copper), - 'E', - OrePrefixes.circuit.get(Materials.Basic), - 'P', - OrePrefixes.plank.get(Materials.Wood), - 'B', - OrePrefixes.battery.get(Materials.Basic) - }); + GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L), + bits_no_remove_buffered, + new Object[] { "PPP", "WBW", "PEP", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', + OrePrefixes.circuit.get(Materials.Basic), 'P', OrePrefixes.plank.get(Materials.Wood), 'B', + OrePrefixes.battery.get(Materials.Basic) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("ejectorUpgrade", 1L), bits_no_remove_buffered, new Object[] { - "PHP", - "WEW", - 'W', - OrePrefixes.cableGt01.get(Materials.Copper), - 'E', - OrePrefixes.circuit.get(Materials.Basic), - 'P', - new ItemStack(Blocks.piston), - 'H', - new ItemStack(Blocks.hopper) - }); + GT_ModHandler.getIC2Item("ejectorUpgrade", 1L), + bits_no_remove_buffered, + new Object[] { "PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', + OrePrefixes.circuit.get(Materials.Basic), 'P', new ItemStack(Blocks.piston), 'H', + new ItemStack(Blocks.hopper) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("suBattery", 1L), bits_no_remove_buffered, new Object[] { - "W", - "C", - "R", - 'W', - OrePrefixes.cableGt01.get(Materials.Copper), - 'C', - OrePrefixes.dust.get(Materials.HydratedCoal), - 'R', - OrePrefixes.dust.get(Materials.Redstone) - }); + GT_ModHandler.getIC2Item("suBattery", 1L), + bits_no_remove_buffered, + new Object[] { "W", "C", "R", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C', + OrePrefixes.dust.get(Materials.HydratedCoal), 'R', + OrePrefixes.dust.get(Materials.Redstone) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("pullingUpgrade", 1L), bits_no_remove_buffered, new Object[] { - "PHP", - "WEW", - 'W', - OrePrefixes.cableGt01.get(Materials.Copper), - 'P', - new ItemStack(Blocks.sticky_piston), - 'R', - new ItemStack(Blocks.hopper), - 'E', - OrePrefixes.circuit.get(Materials.Basic) - }); + GT_ModHandler.getIC2Item("pullingUpgrade", 1L), + bits_no_remove_buffered, + new Object[] { "PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'P', + new ItemStack(Blocks.sticky_piston), 'R', new ItemStack(Blocks.hopper), 'E', + OrePrefixes.circuit.get(Materials.Basic) }); } else { GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("glassFiberCableItem", 1L), bits_no_remove_buffered, new Object[] { - "GGG", - "EDE", - "GGG", - 'G', - new ItemStack(Blocks.glass, 1, 32767), - 'D', - OrePrefixes.dust.get(Materials.Silver), - 'E', - ItemList.IC2_Energium_Dust.get(1L) - }); + GT_ModHandler.getIC2Item("glassFiberCableItem", 1L), + bits_no_remove_buffered, + new Object[] { "GGG", "EDE", "GGG", 'G', new ItemStack(Blocks.glass, 1, 32767), 'D', + OrePrefixes.dust.get(Materials.Silver), 'E', ItemList.IC2_Energium_Dust.get(1L) }); } if (Loader.isModLoaded("NotEnoughItems")) { @@ -3032,105 +1991,52 @@ public class GT_CraftingRecipeLoader implements Runnable { codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("reactorMOXQuad", 1L, 1)); } GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("UranFuel", 1L), bits_no_remove_buffered, new Object[] { - "UUU", - "NNN", - "UUU", - 'U', - OrePrefixes.ingot.get(Materials.Uranium), - 'N', - OrePrefixes.nugget.get(Materials.Uranium235) - }); - GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("MOXFuel", 1L), bits_no_remove_buffered, new Object[] { - "UUU", - "NNN", - "UUU", - 'U', - OrePrefixes.ingot.get(Materials.Uranium), - 'N', - OrePrefixes.ingot.get(Materials.Plutonium) - }); + GT_ModHandler.getIC2Item("UranFuel", 1L), + bits_no_remove_buffered, + new Object[] { "UUU", "NNN", "UUU", 'U', OrePrefixes.ingot.get(Materials.Uranium), 'N', + OrePrefixes.nugget.get(Materials.Uranium235) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("MOXFuel", 1L), + bits_no_remove_buffered, + new Object[] { "UUU", "NNN", "UUU", 'U', OrePrefixes.ingot.get(Materials.Uranium), 'N', + OrePrefixes.ingot.get(Materials.Plutonium) }); if (!GregTech_API.mIC2Classic) { GT_ModHandler.removeRecipeByOutputDelayed(Ic2Items.miningLaser.copy()); GT_ModHandler.addCraftingRecipe( - Ic2Items.miningLaser.copy(), GT_ModHandler.RecipeBits.BUFFERED, new Object[] { - "PPP", - "GEC", - "SBd", - 'P', - OrePrefixes.plate.get(Materials.Titanium), - 'G', - OrePrefixes.gemExquisite.get(Materials.Diamond), - 'E', - ItemList.Emitter_HV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'S', - OrePrefixes.screw.get(Materials.Titanium), - 'B', - new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) - }); + Ic2Items.miningLaser.copy(), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', + OrePrefixes.gemExquisite.get(Materials.Diamond), 'E', ItemList.Emitter_HV, 'C', + OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), + 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); GT_ModHandler.addCraftingRecipe( - Ic2Items.miningLaser.copy(), GT_ModHandler.RecipeBits.BUFFERED, new Object[] { - "PPP", - "GEC", - "SBd", - 'P', - OrePrefixes.plate.get(Materials.Titanium), - 'G', - OrePrefixes.gemExquisite.get(Materials.Ruby), - 'E', - ItemList.Emitter_HV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'S', - OrePrefixes.screw.get(Materials.Titanium), - 'B', - new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) - }); + Ic2Items.miningLaser.copy(), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', + OrePrefixes.gemExquisite.get(Materials.Ruby), 'E', ItemList.Emitter_HV, 'C', + OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), + 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); GT_ModHandler.addCraftingRecipe( - Ic2Items.miningLaser.copy(), GT_ModHandler.RecipeBits.BUFFERED, new Object[] { - "PPP", - "GEC", - "SBd", - 'P', - OrePrefixes.plate.get(Materials.Titanium), - 'G', - OrePrefixes.gemExquisite.get(Materials.Jasper), - 'E', - ItemList.Emitter_HV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'S', - OrePrefixes.screw.get(Materials.Titanium), - 'B', - new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) - }); + Ic2Items.miningLaser.copy(), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', + OrePrefixes.gemExquisite.get(Materials.Jasper), 'E', ItemList.Emitter_HV, 'C', + OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), + 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); GT_ModHandler.addCraftingRecipe( - Ic2Items.miningLaser.copy(), GT_ModHandler.RecipeBits.BUFFERED, new Object[] { - "PPP", - "GEC", - "SBd", - 'P', - OrePrefixes.plate.get(Materials.Titanium), - 'G', - OrePrefixes.gemExquisite.get(Materials.GarnetRed), - 'E', - ItemList.Emitter_HV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'S', - OrePrefixes.screw.get(Materials.Titanium), - 'B', - new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) - }); + Ic2Items.miningLaser.copy(), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', + OrePrefixes.gemExquisite.get(Materials.GarnetRed), 'E', ItemList.Emitter_HV, 'C', + OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), + 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); } GT_ModHandler.removeRecipeDelayed(GT_ModHandler.getIC2Item("miningPipe", 8)); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("miningPipe", 1), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"hPf", 'P', OrePrefixes.pipeSmall.get(Materials.Steel)}); + new Object[] { "hPf", 'P', OrePrefixes.pipeSmall.get(Materials.Steel) }); GT_Values.RA.addWiremillRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Steel, 1), GT_ModHandler.getIC2Item("miningPipe", 1), @@ -3138,33 +2044,17 @@ public class GT_CraftingRecipeLoader implements Runnable { 16); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("luminator", 16L), bits_no_remove_buffered, new Object[] { - "RTR", - "GHG", - "GGG", - 'H', - OrePrefixes.cell.get(Materials.Helium), - 'T', - OrePrefixes.ingot.get(Materials.Tin), - 'R', - OrePrefixes.ingot.get(Materials.AnyIron), - 'G', - new ItemStack(Blocks.glass, 1) - }); + GT_ModHandler.getIC2Item("luminator", 16L), + bits_no_remove_buffered, + new Object[] { "RTR", "GHG", "GGG", 'H', OrePrefixes.cell.get(Materials.Helium), 'T', + OrePrefixes.ingot.get(Materials.Tin), 'R', OrePrefixes.ingot.get(Materials.AnyIron), 'G', + new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("luminator", 16L), bits_no_remove_buffered, new Object[] { - "RTR", - "GHG", - "GGG", - 'H', - OrePrefixes.cell.get(Materials.Mercury), - 'T', - OrePrefixes.ingot.get(Materials.Tin), - 'R', - OrePrefixes.ingot.get(Materials.AnyIron), - 'G', - new ItemStack(Blocks.glass, 1) - }); + GT_ModHandler.getIC2Item("luminator", 16L), + bits_no_remove_buffered, + new Object[] { "RTR", "GHG", "GGG", 'H', OrePrefixes.cell.get(Materials.Mercury), 'T', + OrePrefixes.ingot.get(Materials.Tin), 'R', OrePrefixes.ingot.get(Materials.AnyIron), 'G', + new ItemStack(Blocks.glass, 1) }); GT_ModHandler.removeRecipeDelayed( tStack = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), @@ -3213,179 +2103,96 @@ public class GT_CraftingRecipeLoader implements Runnable { new ItemStack(Items.redstone, 1), new ItemStack(Blocks.cobblestone, 1)); GT_ModHandler.removeRecipeDelayed(tStack); - GT_ModHandler.addCraftingRecipe(tStack, bits_no_remove_buffered, new Object[] { - "RGR", - "RPR", - "RCR", - 'G', - OreDictNames.craftingGrinder, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'R', - OrePrefixes.plate.get(Materials.Steel), - 'P', - OreDictNames.craftingPiston - }); + GT_ModHandler.addCraftingRecipe( + tStack, + bits_no_remove_buffered, + new Object[] { "RGR", "RPR", "RCR", 'G', OreDictNames.craftingGrinder, 'C', + OrePrefixes.circuit.get(Materials.Advanced), 'R', OrePrefixes.plate.get(Materials.Steel), + 'P', OreDictNames.craftingPiston }); } if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "beryliumreflector", true))) { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1), bits_no_remove_buffered, new Object[] { - " N ", - "NBN", - " N ", - 'B', - OrePrefixes.plateDouble.get(Materials.Beryllium), - 'N', - GT_ModHandler.getIC2Item("reactorReflector", 1L, 1) - }); + GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1), + bits_no_remove_buffered, + new Object[] { " N ", "NBN", " N ", 'B', OrePrefixes.plateDouble.get(Materials.Beryllium), 'N', + GT_ModHandler.getIC2Item("reactorReflector", 1L, 1) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1), bits_no_remove_buffered, new Object[] { - " B ", - "NCN", - " B ", - 'B', - OrePrefixes.plate.get(Materials.Beryllium), - 'N', - GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), - 'C', - OrePrefixes.plate.get(Materials.TungstenCarbide) - }); + GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1), + bits_no_remove_buffered, + new Object[] { " B ", "NCN", " B ", 'B', OrePrefixes.plate.get(Materials.Beryllium), 'N', + GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), 'C', + OrePrefixes.plate.get(Materials.TungstenCarbide) }); } if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "reflector", true))) { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflector", 1L, 1)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), bits_no_remove_buffered, new Object[] { - "TGT", - "GSG", - "TGT", - 'T', - OrePrefixes.plate.get(Materials.Tin), - 'G', - OrePrefixes.dust.get(Materials.Graphite), - 'S', - OrePrefixes.plateDouble.get(Materials.Steel) - }); + GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), + bits_no_remove_buffered, + new Object[] { "TGT", "GSG", "TGT", 'T', OrePrefixes.plate.get(Materials.Tin), 'G', + OrePrefixes.dust.get(Materials.Graphite), 'S', + OrePrefixes.plateDouble.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), bits_no_remove_buffered, new Object[] { - "TTT", - "GSG", - "TTT", - 'T', - OrePrefixes.plate.get(Materials.TinAlloy), - 'G', - OrePrefixes.dust.get(Materials.Graphite), - 'S', - OrePrefixes.plate.get(Materials.Beryllium) - }); + GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), + bits_no_remove_buffered, + new Object[] { "TTT", "GSG", "TTT", 'T', OrePrefixes.plate.get(Materials.TinAlloy), 'G', + OrePrefixes.dust.get(Materials.Graphite), 'S', + OrePrefixes.plate.get(Materials.Beryllium) }); } if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "cropharvester", true))) { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("crophavester", 1L)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("crophavester", 1L), bits_no_remove_buffered, new Object[] { - "ACA", - "PMS", - "WOW", - 'M', - ItemList.Hull_MV, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'A', - ItemList.Robot_Arm_LV, - 'P', - ItemList.Electric_Piston_LV, - 'S', - ItemList.Sensor_LV, - 'W', - OrePrefixes.toolHeadSense.get(Materials.Aluminium), - 'O', - ItemList.Conveyor_Module_LV - }); + GT_ModHandler.getIC2Item("crophavester", 1L), + bits_no_remove_buffered, + new Object[] { "ACA", "PMS", "WOW", 'M', ItemList.Hull_MV, 'C', + OrePrefixes.circuit.get(Materials.Good), 'A', ItemList.Robot_Arm_LV, 'P', + ItemList.Electric_Piston_LV, 'S', ItemList.Sensor_LV, 'W', + OrePrefixes.toolHeadSense.get(Materials.Aluminium), 'O', ItemList.Conveyor_Module_LV }); } if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "rtg", true))) { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTGenerator", 1L)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("RTGenerator", 1L), bits_no_remove_buffered, new Object[] { - "III", - "IMI", - "ICI", - 'I', - OrePrefixes.itemCasing.get(Materials.Steel), - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'M', - ItemList.Hull_IV - }); + GT_ModHandler.getIC2Item("RTGenerator", 1L), + bits_no_remove_buffered, + new Object[] { "III", "IMI", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C', + OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV }); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTHeatGenerator", 1L)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("RTHeatGenerator", 1L), bits_no_remove_buffered, new Object[] { - "III", - "IMB", - "ICI", - 'I', - OrePrefixes.itemCasing.get(Materials.Steel), - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'M', - ItemList.Hull_IV, - 'B', - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1) - }); + GT_ModHandler.getIC2Item("RTHeatGenerator", 1L), + bits_no_remove_buffered, + new Object[] { "III", "IMB", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C', + OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV, 'B', + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1) }); } if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "windRotor", true))) { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("carbonrotor", 1L)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("carbonrotor", 1L), bits_no_remove_buffered, new Object[] { - "dBS", - "BTB", - "SBw", - 'B', - GT_ModHandler.getIC2Item("carbonrotorblade", 1), - 'S', - OrePrefixes.screw.get(Materials.Iridium), - 'T', - GT_ModHandler.getIC2Item("steelshaft", 1) - }); + GT_ModHandler.getIC2Item("carbonrotor", 1L), + bits_no_remove_buffered, + new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("carbonrotorblade", 1), 'S', + OrePrefixes.screw.get(Materials.Iridium), 'T', GT_ModHandler.getIC2Item("steelshaft", 1) }); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("steelrotor", 1L)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("steelrotor", 1L), bits_no_remove_buffered, new Object[] { - "dBS", - "BTB", - "SBw", - 'B', - GT_ModHandler.getIC2Item("steelrotorblade", 1), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'T', - GT_ModHandler.getIC2Item("ironshaft", 1) - }); + GT_ModHandler.getIC2Item("steelrotor", 1L), + bits_no_remove_buffered, + new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("steelrotorblade", 1), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'T', + GT_ModHandler.getIC2Item("ironshaft", 1) }); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("ironrotor", 1L)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("ironrotor", 1L), bits_no_remove_buffered, new Object[] { - "dBS", - "BTB", - "SBw", - 'B', - GT_ModHandler.getIC2Item("ironrotorblade", 1), - 'S', - OrePrefixes.screw.get(Materials.WroughtIron), - 'T', - GT_ModHandler.getIC2Item("ironshaft", 1) - }); + GT_ModHandler.getIC2Item("ironrotor", 1L), + bits_no_remove_buffered, + new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("ironrotorblade", 1), 'S', + OrePrefixes.screw.get(Materials.WroughtIron), 'T', + GT_ModHandler.getIC2Item("ironshaft", 1) }); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("woodrotor", 1L)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("woodrotor", 1L), bits_no_remove_buffered, new Object[] { - "dBS", - "BTB", - "SBw", - 'B', - GT_ModHandler.getIC2Item("woodrotorblade", 1), - 'S', - OrePrefixes.screw.get(Materials.WroughtIron), - 'T', - OrePrefixes.stickLong.get(Materials.WroughtIron) - }); + GT_ModHandler.getIC2Item("woodrotor", 1L), + bits_no_remove_buffered, + new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("woodrotorblade", 1), 'S', + OrePrefixes.screw.get(Materials.WroughtIron), 'T', + OrePrefixes.stickLong.get(Materials.WroughtIron) }); } if (GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L) != null) { tStack = GT_ModHandler.getRecipeOutput( @@ -3400,21 +2207,13 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L)); if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "quarry", true)) { GT_ModHandler.removeRecipeByOutputDelayed(tStack); - GT_ModHandler.addCraftingRecipe(tStack, bits_no_remove_buffered, new Object[] { - "ICI", - "GIG", - "DPD", - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'D', - OrePrefixes.gear.get(Materials.Diamond), - 'G', - OrePrefixes.gear.get(Materials.Gold), - 'I', - OrePrefixes.gear.get(Materials.Steel), - 'P', - GT_ModHandler.getIC2Item("diamondDrill", 1L, 32767) - }); + GT_ModHandler.addCraftingRecipe( + tStack, + bits_no_remove_buffered, + new Object[] { "ICI", "GIG", "DPD", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'D', + OrePrefixes.gear.get(Materials.Diamond), 'G', OrePrefixes.gear.get(Materials.Gold), 'I', + OrePrefixes.gear.get(Materials.Steel), 'P', + GT_ModHandler.getIC2Item("diamondDrill", 1L, 32767) }); } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "quarry", false)) { GT_ModHandler.removeRecipeByOutputDelayed(tStack); @@ -3427,42 +2226,28 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 2), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"SSS", " m ", 'S', new ItemStack(Items.reeds)}); + new Object[] { "SSS", " m ", 'S', new ItemStack(Items.reeds) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"Sm ", 'S', new ItemStack(Items.reeds)}); + new Object[] { "Sm ", 'S', new ItemStack(Items.reeds) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.paper, Materials.Empty, 2), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - " C ", - "SSS", - " C ", - 'S', - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1), - 'C', - new ItemStack(Blocks.stone_slab) - }); + new Object[] { " C ", "SSS", " C ", 'S', + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1), 'C', + new ItemStack(Blocks.stone_slab) }); } GT_Log.out.println("GT_Mod: Applying Recipes for Tools"); if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "nanosaber", true))) { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("nanoSaber", 1L)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("nanoSaber", 1L), bits_no_remove_buffered, new Object[] { - "PI ", - "PI ", - "CLC", - 'L', - OrePrefixes.battery.get(Materials.Master), - 'I', - OrePrefixes.plateAlloy.get("Iridium"), - 'P', - OrePrefixes.plate.get(Materials.Platinum), - 'C', - OrePrefixes.circuit.get(Materials.Elite) - }); + GT_ModHandler.getIC2Item("nanoSaber", 1L), + bits_no_remove_buffered, + new Object[] { "PI ", "PI ", "CLC", 'L', OrePrefixes.battery.get(Materials.Master), 'I', + OrePrefixes.plateAlloy.get("Iridium"), 'P', OrePrefixes.plate.get(Materials.Platinum), 'C', + OrePrefixes.circuit.get(Materials.Elite) }); } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "namefix", true)) { @@ -3470,7 +2255,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( new ItemStack(Items.flint_and_steel, 1), bits_no_remove_buffered, - new Object[] {"S ", " F", 'F', new ItemStack(Items.flint, 1), 'S', "nuggetSteel"}); + new Object[] { "S ", " F", 'F', new ItemStack(Items.flint, 1), 'S', "nuggetSteel" }); } GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("diamondDrill", 1L)); @@ -3502,7 +2287,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("electricTreetap", 1L)); // GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("electricTreetap", 1L), bits_no_remove_buffered, new - // Object[]{" B ", "SCS", "S ", 'C', OrePrefixes.circuit.get(Materials.Basic), 'B', + // Object[]{" B ", "SCS", "S ", 'C', OrePrefixes.circuit.get(Materials.Basic), 'B', // OrePrefixes.battery.get(Materials.Basic), 'S', // GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "electricsteeltools", true) ? // OrePrefixes.plate.get(Materials.StainlessSteel) : OrePrefixes.plate.get(Materials.Iron)}); @@ -3527,71 +2312,40 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, GT_Values.W), bits_no_remove_buffered, - new Object[] { - "CJC", - "TNT", - "WPW", - 'C', - OrePrefixes.plateAlloy.get(Materials.Advanced), - 'T', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'J', - GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1, GT_Values.W), - 'N', - GT_ModHandler.getModItem("IC2", "itemArmorNanoChestplate", 1, GT_Values.W), - 'W', - OrePrefixes.wireGt12.get(Materials.Platinum), - 'P', - OrePrefixes.circuit.get(Materials.Elite) - }); - - GT_ModHandler.removeRecipeByOutputDelayed( - GT_ModHandler.getModItem("GraviSuite", "advLappack", 1, GT_Values.W)); + new Object[] { "CJC", "TNT", "WPW", 'C', OrePrefixes.plateAlloy.get(Materials.Advanced), 'T', + OrePrefixes.plate.get(Materials.TungstenSteel), 'J', + GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1, GT_Values.W), 'N', + GT_ModHandler.getModItem("IC2", "itemArmorNanoChestplate", 1, GT_Values.W), 'W', + OrePrefixes.wireGt12.get(Materials.Platinum), 'P', + OrePrefixes.circuit.get(Materials.Elite) }); + + GT_ModHandler + .removeRecipeByOutputDelayed(GT_ModHandler.getModItem("GraviSuite", "advLappack", 1, GT_Values.W)); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getModItem("GraviSuite", "advLappack", 1, GT_Values.W), bits_no_remove_buffered, - new Object[] { - "CEC", - "EJE", - "WPW", - 'C', - OrePrefixes.plateAlloy.get(Materials.Carbon), - 'J', - GT_ModHandler.getModItem("IC2", "itemArmorEnergypack", 1L, GT_Values.W), - 'E', - GT_ModHandler.getModItem("IC2", "itemBatCrystal", 1L, GT_Values.W), - 'W', - OrePrefixes.wireGt04.get(Materials.Platinum), - 'P', - OrePrefixes.circuit.get(Materials.Data) - }); - - GT_ModHandler.removeRecipeByOutputDelayed( - GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1, GT_Values.W)); + new Object[] { "CEC", "EJE", "WPW", 'C', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', + GT_ModHandler.getModItem("IC2", "itemArmorEnergypack", 1L, GT_Values.W), 'E', + GT_ModHandler.getModItem("IC2", "itemBatCrystal", 1L, GT_Values.W), 'W', + OrePrefixes.wireGt04.get(Materials.Platinum), 'P', + OrePrefixes.circuit.get(Materials.Data) }); + + GT_ModHandler + .removeRecipeByOutputDelayed(GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1, GT_Values.W)); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1, GT_Values.W), bits_no_remove_buffered, - new Object[] { - "CJC", - "EXE", - "YZY", - 'C', - OrePrefixes.plateAlloy.get(Materials.Carbon), - 'J', - GT_ModHandler.getModItem("IC2", "itemArmorJetpackElectric", 1, GT_Values.W), - 'E', - OrePrefixes.plate.get(Materials.Titanium), - 'X', - GT_ModHandler.getModItem("IC2", "itemArmorAlloyChestplate", 1L), - 'Z', - OrePrefixes.circuit.get(Materials.Data), - 'Y', - OrePrefixes.wireGt02.get(Materials.Platinum) - }); + new Object[] { "CJC", "EXE", "YZY", 'C', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', + GT_ModHandler.getModItem("IC2", "itemArmorJetpackElectric", 1, GT_Values.W), 'E', + OrePrefixes.plate.get(Materials.Titanium), 'X', + GT_ModHandler.getModItem("IC2", "itemArmorAlloyChestplate", 1L), 'Z', + OrePrefixes.circuit.get(Materials.Data), 'Y', + OrePrefixes.wireGt02.get(Materials.Platinum) }); } GT_ModHandler.addShapelessCraftingRecipe( - Materials.Fireclay.getDust(2), new Object[] {Materials.Brick.getDust(1), Materials.Clay.getDust(1)}); + Materials.Fireclay.getDust(2), + new Object[] { Materials.Brick.getDust(1), Materials.Clay.getDust(1) }); ItemStack flask = ItemList.VOLUMETRIC_FLASK.get(1); NBTTagCompound nbtFlask = new NBTTagCompound(); @@ -3605,15 +2359,12 @@ public class GT_CraftingRecipeLoader implements Runnable { 24); if (Loader.isModLoaded("bartworks")) { - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 1L, 88), - 'F', - OrePrefixes.frameGt.get(Materials.Chrome) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 1L, 88), 'F', + OrePrefixes.frameGt.get(Materials.Chrome) }); } } } diff --git a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java index 5af34bf413..409bdb4bfe 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java @@ -1,31 +1,27 @@ package gregtech.loaders.postload; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_BaseCrop; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class GT_CropLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Register Crops to IC2."); try { - /*Tags: - * Vines = Tendrilly - * Edible = Food - * + /* + * Tags: Vines = Tendrilly Edible = Food */ - ItemStack[] tI = { - ItemList.Crop_Drop_Indigo.get(4L), - ItemList.Crop_Drop_MilkWart.get(4L), - new ItemStack(Blocks.brown_mushroom, 4), - new ItemStack(Blocks.red_mushroom, 4) - }; + ItemStack[] tI = { ItemList.Crop_Drop_Indigo.get(4L), ItemList.Crop_Drop_MilkWart.get(4L), + new ItemStack(Blocks.brown_mushroom, 4), new ItemStack(Blocks.red_mushroom, 4) }; new GT_BaseCrop( 124, "Indigo", @@ -41,7 +37,7 @@ public class GT_CropLoader implements Runnable { 0, 4, 0, - new String[] {"Flower", "Blue", "Ingredient"}, + new String[] { "Flower", "Blue", "Ingredient" }, ItemList.Crop_Drop_Indigo.get(1L), null); new GT_BaseCrop( @@ -59,7 +55,7 @@ public class GT_CropLoader implements Runnable { 2, 0, 1, - new String[] {"Silk", "Tendrilly", "Addictive"}, + new String[] { "Silk", "Tendrilly", "Addictive" }, new ItemStack(Items.string, 1), null); new GT_BaseCrop( @@ -77,7 +73,7 @@ public class GT_CropLoader implements Runnable { 2, 1, 12, - new String[] {"Fire", "Dark", "Reed", "Rotten", "Coal", "Oil"}, + new String[] { "Fire", "Dark", "Reed", "Rotten", "Coal", "Oil" }, ItemList.Crop_Drop_OilBerry.get(1L), null); new GT_BaseCrop( @@ -95,10 +91,10 @@ public class GT_CropLoader implements Runnable { 8, 2, 9, - new String[] {"Shiny", "Tendrilly", "Emerald", "Berylium", "Crystal"}, + new String[] { "Shiny", "Tendrilly", "Emerald", "Berylium", "Crystal" }, Materials.Emerald, ItemList.Crop_Drop_BobsYerUncleRanks.get(1L), - new ItemStack[] {new ItemStack(Items.emerald, 1)}); + new ItemStack[] { new ItemStack(Items.emerald, 1) }); new GT_BaseCrop( 128, "Diareed", @@ -114,10 +110,10 @@ public class GT_CropLoader implements Runnable { 10, 2, 10, - new String[] {"Fire", "Shiny", "Reed", "Coal", "Diamond", "Crystal"}, + new String[] { "Fire", "Shiny", "Reed", "Coal", "Diamond", "Crystal" }, Materials.Diamond, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), - new ItemStack[] {new ItemStack(Items.diamond, 1)}); + new ItemStack[] { new ItemStack(Items.diamond, 1) }); new GT_BaseCrop( 129, "Withereed", @@ -133,10 +129,10 @@ public class GT_CropLoader implements Runnable { 4, 1, 3, - new String[] {"Fire", "Undead", "Reed", "Coal", "Rotten", "Wither"}, + new String[] { "Fire", "Undead", "Reed", "Coal", "Rotten", "Wither" }, Materials.Coal, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), - new ItemStack[] {new ItemStack(Items.coal, 1), new ItemStack(Items.coal, 1)}); + new ItemStack[] { new ItemStack(Items.coal, 1), new ItemStack(Items.coal, 1) }); new GT_BaseCrop( 130, "Blazereed", @@ -152,9 +148,9 @@ public class GT_CropLoader implements Runnable { 1, 0, 0, - new String[] {"Fire", "Blaze", "Reed", "Sulfur"}, + new String[] { "Fire", "Blaze", "Reed", "Sulfur" }, new ItemStack(Items.blaze_powder, 1), - new ItemStack[] {new ItemStack(Items.blaze_rod, 1)}); + new ItemStack[] { new ItemStack(Items.blaze_rod, 1) }); new GT_BaseCrop( 131, "Eggplant", @@ -170,14 +166,10 @@ public class GT_CropLoader implements Runnable { 1, 0, 0, - new String[] {"Chicken", "Egg", "Food", "Feather", "Flower", "Addictive"}, + new String[] { "Chicken", "Egg", "Food", "Feather", "Flower", "Addictive" }, new ItemStack(Items.egg, 1), - new ItemStack[] { - new ItemStack(Items.chicken, 1), - new ItemStack(Items.feather, 1), - new ItemStack(Items.feather, 1), - new ItemStack(Items.feather, 1) - }); + new ItemStack[] { new ItemStack(Items.chicken, 1), new ItemStack(Items.feather, 1), + new ItemStack(Items.feather, 1), new ItemStack(Items.feather, 1) }); new GT_BaseCrop( 132, "Corium", @@ -193,7 +185,7 @@ public class GT_CropLoader implements Runnable { 3, 1, 0, - new String[] {"Cow", "Silk", "Tendrilly"}, + new String[] { "Cow", "Silk", "Tendrilly" }, new ItemStack(Items.leather, 1), null); new GT_BaseCrop( @@ -211,11 +203,10 @@ public class GT_CropLoader implements Runnable { 1, 0, 3, - new String[] {"Toxic", "Undead", "Tendrilly", "Food", "Rotten"}, + new String[] { "Toxic", "Undead", "Tendrilly", "Food", "Rotten" }, new ItemStack(Items.rotten_flesh, 1), - new ItemStack[] { - ItemList.Dye_Bonemeal.get(1L), ItemList.Dye_Bonemeal.get(1L), new ItemStack(Items.bone, 1) - }); + new ItemStack[] { ItemList.Dye_Bonemeal.get(1L), ItemList.Dye_Bonemeal.get(1L), + new ItemStack(Items.bone, 1) }); new GT_BaseCrop( 134, "Creeperweed", @@ -231,7 +222,7 @@ public class GT_CropLoader implements Runnable { 5, 1, 3, - new String[] {"Creeper", "Tendrilly", "Explosive", "Fire", "Sulfur", "Saltpeter", "Coal"}, + new String[] { "Creeper", "Tendrilly", "Explosive", "Fire", "Sulfur", "Saltpeter", "Coal" }, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L), null); new GT_BaseCrop( @@ -249,13 +240,10 @@ public class GT_CropLoader implements Runnable { 2, 1, 6, - new String[] {"Ender", "Flower", "Shiny"}, + new String[] { "Ender", "Flower", "Shiny" }, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderPearl, 1L), - new ItemStack[] { - new ItemStack(Items.ender_pearl, 1), - new ItemStack(Items.ender_pearl, 1), - new ItemStack(Items.ender_eye, 1) - }); + new ItemStack[] { new ItemStack(Items.ender_pearl, 1), new ItemStack(Items.ender_pearl, 1), + new ItemStack(Items.ender_eye, 1) }); new GT_BaseCrop( 136, "Meatrose", @@ -271,14 +259,10 @@ public class GT_CropLoader implements Runnable { 1, 3, 0, - new String[] {"Food", "Flower", "Cow", "Fish", "Chicken", "Pig"}, + new String[] { "Food", "Flower", "Cow", "Fish", "Chicken", "Pig" }, new ItemStack(Items.dye, 1, 9), - new ItemStack[] { - new ItemStack(Items.beef, 1), - new ItemStack(Items.porkchop, 1), - new ItemStack(Items.chicken, 1), - new ItemStack(Items.fish, 1) - }); + new ItemStack[] { new ItemStack(Items.beef, 1), new ItemStack(Items.porkchop, 1), + new ItemStack(Items.chicken, 1), new ItemStack(Items.fish, 1) }); new GT_BaseCrop( 137, "Milkwart", @@ -294,7 +278,7 @@ public class GT_CropLoader implements Runnable { 0, 1, 0, - new String[] {"Food", "Milk", "Cow"}, + new String[] { "Food", "Milk", "Cow" }, ItemList.Crop_Drop_MilkWart.get(1L), null); new GT_BaseCrop( @@ -312,7 +296,7 @@ public class GT_CropLoader implements Runnable { 0, 0, 2, - new String[] {"Slime", "Bouncy", "Sticky", "Bush"}, + new String[] { "Slime", "Bouncy", "Sticky", "Bush" }, new ItemStack(Items.slime_ball, 1), null); new GT_BaseCrop( @@ -330,9 +314,9 @@ public class GT_CropLoader implements Runnable { 4, 1, 3, - new String[] {"Toxic", "Silk", "Spider", "Flower", "Ingredient", "Addictive"}, + new String[] { "Toxic", "Silk", "Spider", "Flower", "Ingredient", "Addictive" }, new ItemStack(Items.string, 1), - new ItemStack[] {new ItemStack(Items.spider_eye, 1), new ItemStack(Blocks.web, 1)}); + new ItemStack[] { new ItemStack(Items.spider_eye, 1), new ItemStack(Blocks.web, 1) }); new GT_BaseCrop( 140, "Tearstalks", @@ -348,7 +332,7 @@ public class GT_CropLoader implements Runnable { 0, 0, 0, - new String[] {"Healing", "Nether", "Ingredient", "Reed", "Ghast"}, + new String[] { "Healing", "Nether", "Ingredient", "Reed", "Ghast" }, new ItemStack(Items.ghast_tear, 1), null); new GT_BaseCrop( @@ -366,7 +350,7 @@ public class GT_CropLoader implements Runnable { 3, 0, 0, - new String[] {"Shiny", "Metal", "Pine", "Tin", "Bush"}, + new String[] { "Shiny", "Metal", "Pine", "Tin", "Bush" }, Materials.Tin, ItemList.Crop_Drop_Tine.get(1L), null); @@ -385,7 +369,7 @@ public class GT_CropLoader implements Runnable { 1, 1, 1, - new String[] {"Shiny", "Metal", "Cotton", "Copper", "Bush"}, + new String[] { "Shiny", "Metal", "Cotton", "Copper", "Bush" }, Materials.Copper, ItemList.Crop_Drop_Coppon.get(1L), null); @@ -404,7 +388,7 @@ public class GT_CropLoader implements Runnable { 0, 0, 2, - new String[] {"Food", "Mushroom", "Ingredient"}, + new String[] { "Food", "Mushroom", "Ingredient" }, new ItemStack(Blocks.brown_mushroom, 1), null); new GT_BaseCrop( @@ -422,7 +406,7 @@ public class GT_CropLoader implements Runnable { 3, 0, 2, - new String[] {"Toxic", "Mushroom", "Ingredient"}, + new String[] { "Toxic", "Mushroom", "Ingredient" }, new ItemStack(Blocks.red_mushroom, 1), null); new GT_BaseCrop( @@ -440,7 +424,7 @@ public class GT_CropLoader implements Runnable { 1, 0, 0, - new String[] {"Shiny", "Metal", "Silver", "Reed"}, + new String[] { "Shiny", "Metal", "Silver", "Reed" }, Materials.Silver, ItemList.Crop_Drop_Argentia.get(1L), null); @@ -459,7 +443,7 @@ public class GT_CropLoader implements Runnable { 3, 1, 1, - new String[] {"Heavy", "Metal", "Lead", "Reed"}, + new String[] { "Heavy", "Metal", "Lead", "Reed" }, Materials.Lead, ItemList.Crop_Drop_Plumbilia.get(1L), null); @@ -478,9 +462,9 @@ public class GT_CropLoader implements Runnable { 7, 2, 8, - new String[] {"Metal", "Tendrilly", "Iron"}, + new String[] { "Metal", "Tendrilly", "Iron" }, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steeleaf, 1L), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steeleaf, 1L)}); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steeleaf, 1L) }); new GT_BaseCrop( 148, "Liveroots", @@ -496,9 +480,9 @@ public class GT_CropLoader implements Runnable { 5, 2, 6, - new String[] {"Wood", "Tendrilly"}, + new String[] { "Wood", "Tendrilly" }, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 1L), - new ItemStack[] {ItemList.TF_LiveRoot.get(1L)}); + new ItemStack[] { ItemList.TF_LiveRoot.get(1L) }); new GT_BaseCrop( 149, "Trollplant", @@ -514,13 +498,10 @@ public class GT_CropLoader implements Runnable { 5, 2, 8, - new String[] {"Troll", "Bad", "Scrap"}, + new String[] { "Troll", "Bad", "Scrap" }, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.FoolsRuby, 1L), - new ItemStack[] { - ItemList.IC2_Plantball.get(1), - ItemList.IC2_Scrap.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium241, 1L) - }); + new ItemStack[] { ItemList.IC2_Plantball.get(1), ItemList.IC2_Scrap.get(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium241, 1L) }); new GT_BaseCrop( 150, "Lazulia", @@ -536,7 +517,7 @@ public class GT_CropLoader implements Runnable { 5, 7, 4, - new String[] {"Shiny", "Bad", "Crystal", "Lapis"}, + new String[] { "Shiny", "Bad", "Crystal", "Lapis" }, Materials.Lapis, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1L), null); @@ -555,7 +536,7 @@ public class GT_CropLoader implements Runnable { 3, 5, 4, - new String[] {"Light", "Shiny", "Crystal"}, + new String[] { "Light", "Shiny", "Crystal" }, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), null); new GT_BaseCrop( @@ -573,13 +554,11 @@ public class GT_CropLoader implements Runnable { 5, 4, 8, - new String[] {"Growth", "Healing", "Flower"}, + new String[] { "Growth", "Healing", "Flower" }, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L), - new ItemStack[] { - ItemList.IC2_Fertilizer.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1L) - }); + new ItemStack[] { ItemList.IC2_Fertilizer.get(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1L) }); new GT_BaseCrop( 154, "Bauxia", @@ -595,7 +574,7 @@ public class GT_CropLoader implements Runnable { 2, 3, 3, - new String[] {"Metal", "Aluminium", "Reed", "Aluminium"}, + new String[] { "Metal", "Aluminium", "Reed", "Aluminium" }, Materials.Aluminium, ItemList.Crop_Drop_Bauxite.get(1), null); @@ -614,7 +593,7 @@ public class GT_CropLoader implements Runnable { 3, 3, 1, - new String[] {"Metal", "Heavy", "Reed", "Titanium"}, + new String[] { "Metal", "Heavy", "Reed", "Titanium" }, Materials.Titanium, ItemList.Crop_Drop_Ilmenite.get(1), null); @@ -633,10 +612,10 @@ public class GT_CropLoader implements Runnable { 1, 2, 1, - new String[] {"Radioactive", "Metal", "Danger", "Uranium"}, + new String[] { "Radioactive", "Metal", "Danger", "Uranium" }, Materials.Uranium, ItemList.Crop_Drop_Pitchblende.get(1), - new ItemStack[] {ItemList.Crop_Drop_Uraninite.get(1)}); + new ItemStack[] { ItemList.Crop_Drop_Uraninite.get(1) }); new GT_BaseCrop( 157, "God of Thunder", @@ -652,7 +631,7 @@ public class GT_CropLoader implements Runnable { 5, 1, 2, - new String[] {"Radioactive", "Metal", "Coal", "Thorium"}, + new String[] { "Radioactive", "Metal", "Coal", "Thorium" }, Materials.Thorium, ItemList.Crop_Drop_Thorium.get(1), null); @@ -671,15 +650,11 @@ public class GT_CropLoader implements Runnable { 1, 6, 1, - new String[] {"Transform", "Coal", "Reed"}, + new String[] { "Transform", "Coal", "Reed" }, ItemList.Crop_Drop_UUABerry.get(1L), - new ItemStack[] { - ItemList.Crop_Drop_UUABerry.get(1L), - ItemList.Crop_Drop_UUABerry.get(1L), - ItemList.Crop_Drop_UUABerry.get(1L), - ItemList.Crop_Drop_UUABerry.get(1L), - ItemList.Crop_Drop_UUMBerry.get(1L) - }); + new ItemStack[] { ItemList.Crop_Drop_UUABerry.get(1L), ItemList.Crop_Drop_UUABerry.get(1L), + ItemList.Crop_Drop_UUABerry.get(1L), ItemList.Crop_Drop_UUABerry.get(1L), + ItemList.Crop_Drop_UUMBerry.get(1L) }); new GT_BaseCrop( 159, "Starwart", @@ -695,16 +670,13 @@ public class GT_CropLoader implements Runnable { 0, 1, 0, - new String[] {"Wither", "Nether", "Undead", "Netherstar"}, + new String[] { "Wither", "Nether", "Undead", "Netherstar" }, Materials.NetherStar, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), - new ItemStack(Items.skull, 1), - new ItemStack(Items.skull, 1, 1), - new ItemStack(Items.skull, 1, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1L) - }); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), + new ItemStack(Items.skull, 1), new ItemStack(Items.skull, 1, 1), + new ItemStack(Items.skull, 1, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1L) }); new GT_BaseCrop( 160, "Zomplant", @@ -720,7 +692,7 @@ public class GT_CropLoader implements Runnable { 4, 2, 6, - new String[] {"Zombie", "Rotten", "Undead"}, + new String[] { "Zombie", "Rotten", "Undead" }, new ItemStack(Items.rotten_flesh), null); new GT_BaseCrop( @@ -738,7 +710,7 @@ public class GT_CropLoader implements Runnable { 1, 2, 2, - new String[] {"Metal", "Fire", "Alloy"}, + new String[] { "Metal", "Fire", "Alloy" }, Materials.Nickel, ItemList.Crop_Drop_Nickel.get(1), null); @@ -757,7 +729,7 @@ public class GT_CropLoader implements Runnable { 2, 2, 3, - new String[] {"Metal", "Alloy", "Bush"}, + new String[] { "Metal", "Alloy", "Bush" }, Materials.Zinc, ItemList.Crop_Drop_Zinc.get(1), null); @@ -776,12 +748,10 @@ public class GT_CropLoader implements Runnable { 2, 1, 3, - new String[] {"Crystal", "Fire", "Nether"}, + new String[] { "Crystal", "Fire", "Nether" }, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1L), - }); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1L), }); new GT_BaseCrop( 164, "Olivia", @@ -797,12 +767,10 @@ public class GT_CropLoader implements Runnable { 1, 4, 0, - new String[] {"Crystal", "Shiny", "Processing", "Olivine"}, + new String[] { "Crystal", "Shiny", "Processing", "Olivine" }, Materials.Olivine, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Olivine, 1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), - }); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), }); new GT_BaseCrop( 165, "Sapphirum", @@ -818,12 +786,10 @@ public class GT_CropLoader implements Runnable { 1, 5, 0, - new String[] {"Crystal", "Shiny", "Metal", "Sapphire"}, + new String[] { "Crystal", "Shiny", "Metal", "Sapphire" }, Materials.Sapphire, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sapphire, 1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), - }); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), }); new GT_BaseCrop( 166, "Pyrolusium", @@ -839,7 +805,7 @@ public class GT_CropLoader implements Runnable { 1, 1, 0, - new String[] {"Metal", "Clean", "Bush", "Manganese"}, + new String[] { "Metal", "Clean", "Bush", "Manganese" }, Materials.Manganese, ItemList.Crop_Drop_Manganese.get(1), null); @@ -858,7 +824,7 @@ public class GT_CropLoader implements Runnable { 1, 1, 0, - new String[] {"Metal", "Hard", "Bush", "Tungsten"}, + new String[] { "Metal", "Hard", "Bush", "Tungsten" }, Materials.Tungsten, ItemList.Crop_Drop_Scheelite.get(1), null); @@ -877,7 +843,7 @@ public class GT_CropLoader implements Runnable { 0, 3, 0, - new String[] {"Metal", "Shiny", "Reed", "Platinum"}, + new String[] { "Metal", "Shiny", "Reed", "Platinum" }, Materials.Platinum, ItemList.Crop_Drop_Platinum.get(1), null); @@ -896,10 +862,10 @@ public class GT_CropLoader implements Runnable { 0, 1, 0, - new String[] {"Metal", "Iridium", "Reed"}, + new String[] { "Metal", "Iridium", "Reed" }, Materials.Iridium, ItemList.Crop_Drop_Iridium.get(1), - new ItemStack[] {ItemList.Crop_Drop_Osmium.get(1)}); + new ItemStack[] { ItemList.Crop_Drop_Osmium.get(1) }); new GT_BaseCrop( 170, "Stargatium", @@ -915,10 +881,10 @@ public class GT_CropLoader implements Runnable { 0, 2, 0, - new String[] {"Metal", "Heavy", "Alien", "Naquadah"}, + new String[] { "Metal", "Heavy", "Alien", "Naquadah" }, Materials.Naquadah, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1L), - new ItemStack[] {ItemList.Crop_Drop_Naquadah.get(1)}); + new ItemStack[] { ItemList.Crop_Drop_Naquadah.get(1) }); new GT_BaseCrop( 171, "Lemon", @@ -934,7 +900,7 @@ public class GT_CropLoader implements Runnable { 0, 2, 0, - new String[] {"Food", "Yellow", "Sour"}, + new String[] { "Food", "Yellow", "Sour" }, ItemList.Crop_Drop_Lemon.get(1), null); new GT_BaseCrop( @@ -952,7 +918,7 @@ public class GT_CropLoader implements Runnable { 0, 2, 0, - new String[] {"Food", "Red", "Spicy"}, + new String[] { "Food", "Red", "Spicy" }, ItemList.Crop_Drop_Chilly.get(1), null); new GT_BaseCrop( @@ -970,9 +936,9 @@ public class GT_CropLoader implements Runnable { 0, 2, 0, - new String[] {"Food", "Red"}, + new String[] { "Food", "Red" }, ItemList.Crop_Drop_Tomato.get(1), - new ItemStack[] {ItemList.Crop_Drop_MTomato.get(1)}); + new ItemStack[] { ItemList.Crop_Drop_MTomato.get(1) }); new GT_BaseCrop( 174, "Grape", @@ -988,7 +954,7 @@ public class GT_CropLoader implements Runnable { 0, 2, 0, - new String[] {"Food", "Purple"}, + new String[] { "Food", "Purple" }, ItemList.Crop_Drop_Grapes.get(1), null); new GT_BaseCrop( @@ -1006,7 +972,7 @@ public class GT_CropLoader implements Runnable { 0, 2, 0, - new String[] {"Food", "Brown"}, + new String[] { "Food", "Brown" }, ItemList.Crop_Drop_Onion.get(1), null); new GT_BaseCrop( @@ -1024,7 +990,7 @@ public class GT_CropLoader implements Runnable { 0, 2, 0, - new String[] {"Food", "Green"}, + new String[] { "Food", "Green" }, ItemList.Crop_Drop_Cucumber.get(1), null); new GT_BaseCrop( @@ -1042,7 +1008,7 @@ public class GT_CropLoader implements Runnable { 0, 2, 0, - new String[] {"Food", "Green", "Ingredient"}, + new String[] { "Food", "Green", "Ingredient" }, ItemList.Crop_Drop_TeaLeaf.get(1), null); new GT_BaseCrop( @@ -1060,7 +1026,7 @@ public class GT_CropLoader implements Runnable { 0, 2, 0, - new String[] {"Food", "Yellow", "Oil"}, + new String[] { "Food", "Yellow", "Oil" }, ItemList.Crop_Drop_Rape.get(1), null); new GT_BaseCrop( @@ -1078,7 +1044,7 @@ public class GT_CropLoader implements Runnable { 3, 0, 0, - new String[] {"Metal", "Pine", "Mica", "Bush"}, + new String[] { "Metal", "Pine", "Mica", "Bush" }, Materials.Mica, ItemList.Crop_Drop_Mica.get(1L), null); diff --git a/src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java b/src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java index 52cd2cbd84..4f98363799 100644 --- a/src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java @@ -4,6 +4,7 @@ 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."); diff --git a/src/main/java/gregtech/loaders/postload/GT_FakeRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_FakeRecipeLoader.java index 3e552cf0b2..5c97d4c8c8 100644 --- a/src/main/java/gregtech/loaders/postload/GT_FakeRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_FakeRecipeLoader.java @@ -5,6 +5,7 @@ import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_ModHandler; public class GT_FakeRecipeLoader implements Runnable { + @Override public void run() { if (!GregTech_API.mIC2Classic) { diff --git a/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java b/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java index 30f2ca5650..655d1a06fd 100644 --- a/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java @@ -1,14 +1,16 @@ package gregtech.loaders.postload; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; + import gregtech.GT_Mod; import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Log; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; public class GT_ItemMaxStacksizeLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Changing maximum Stacksizes if configured."); diff --git a/src/main/java/gregtech/loaders/postload/GT_MinableRegistrator.java b/src/main/java/gregtech/loaders/postload/GT_MinableRegistrator.java index c84f22ba04..afa98e0b38 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MinableRegistrator.java +++ b/src/main/java/gregtech/loaders/postload/GT_MinableRegistrator.java @@ -1,10 +1,12 @@ package gregtech.loaders.postload; +import net.minecraft.init.Blocks; + import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; -import net.minecraft.init.Blocks; public class GT_MinableRegistrator implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Adding Blocks to the Miners Valuable List."); diff --git a/src/main/java/gregtech/loaders/postload/GT_PCBFactoryMaterialLoader.java b/src/main/java/gregtech/loaders/postload/GT_PCBFactoryMaterialLoader.java index acec328324..95732076d9 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PCBFactoryMaterialLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_PCBFactoryMaterialLoader.java @@ -5,6 +5,7 @@ import gregtech.api.enums.MaterialsKevlar; import gregtech.api.util.GT_PCBFactoryManager; public class GT_PCBFactoryMaterialLoader { + public static void load() { // add Plastics GT_PCBFactoryManager.addPlasticTier(Materials.Plastic, 1); diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index 585857c50a..7fc271128d 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -3,7 +3,26 @@ package gregtech.loaders.postload; import static gregtech.api.enums.GT_Values.MOD_ID_FR; import static gregtech.api.enums.GT_Values.VP; +import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.google.common.base.Stopwatch; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ProgressManager; import cpw.mods.fml.relauncher.Side; @@ -27,67 +46,55 @@ import gregtech.common.items.behaviors.Behaviour_DataOrb; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabricator; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeOutput; -import java.lang.reflect.InvocationTargetException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class GT_PostLoad { + public static void activateOreDictHandler() { @SuppressWarnings("UnstableApiUsage") // Stable enough for this project Stopwatch stopwatch = Stopwatch.createStarted(); GT_Mod.gregtechproxy.activateOreDictHandler(); - //noinspection UnstableApiUsage// Stable enough for this project - GT_Mod.GT_FML_LOGGER.info( - "Congratulations, you have been waiting long enough (" + stopwatch.stop() + "). Have a Cake."); - GT_Log.out.println("GT_Mod: List of Lists of Tool Recipes: " - + GT_ModHandler.sSingleNonBlockDamagableRecipeList_list.toString()); - GT_Log.out.println("GT_Mod: Vanilla Recipe List -> Outputs null or stackSize <=0: " - + GT_ModHandler.sVanillaRecipeList_warntOutput.toString()); - GT_Log.out.println("GT_Mod: Single Non Block Damageable Recipe List -> Outputs null or stackSize <=0: " - + GT_ModHandler.sSingleNonBlockDamagableRecipeList_warntOutput.toString()); + // noinspection UnstableApiUsage// Stable enough for this project + GT_Mod.GT_FML_LOGGER + .info("Congratulations, you have been waiting long enough (" + stopwatch.stop() + "). Have a Cake."); + GT_Log.out.println( + "GT_Mod: List of Lists of Tool Recipes: " + + GT_ModHandler.sSingleNonBlockDamagableRecipeList_list.toString()); + GT_Log.out.println( + "GT_Mod: Vanilla Recipe List -> Outputs null or stackSize <=0: " + + GT_ModHandler.sVanillaRecipeList_warntOutput.toString()); + GT_Log.out.println( + "GT_Mod: Single Non Block Damageable Recipe List -> Outputs null or stackSize <=0: " + + GT_ModHandler.sSingleNonBlockDamagableRecipeList_warntOutput.toString()); } - public static void removeIc2Recipes( - Map<IRecipeInput, RecipeOutput> aMaceratorRecipeList, - Map<IRecipeInput, RecipeOutput> aCompressorRecipeList, - Map<IRecipeInput, RecipeOutput> aExtractorRecipeList, + public static void removeIc2Recipes(Map<IRecipeInput, RecipeOutput> aMaceratorRecipeList, + Map<IRecipeInput, RecipeOutput> aCompressorRecipeList, Map<IRecipeInput, RecipeOutput> aExtractorRecipeList, Map<IRecipeInput, RecipeOutput> aOreWashingRecipeList, Map<IRecipeInput, RecipeOutput> aThermalCentrifugeRecipeList) { @SuppressWarnings("UnstableApiUsage") // Stable enough for this project Stopwatch stopwatch = Stopwatch.createStarted(); // remove gemIridium exploit ItemStack iridiumOre = GT_ModHandler.getIC2Item("iridiumOre", 1); - aCompressorRecipeList.entrySet().parallelStream() - .filter(e -> e.getKey().getInputs().size() == 1 - && e.getKey().getInputs().get(0).isItemEqual(iridiumOre)) - .findAny() - .ifPresent(e -> aCompressorRecipeList.remove(e.getKey())); + aCompressorRecipeList.entrySet().parallelStream().filter( + e -> e.getKey().getInputs().size() == 1 && e.getKey().getInputs().get(0).isItemEqual(iridiumOre)) + .findAny().ifPresent(e -> aCompressorRecipeList.remove(e.getKey())); // Add default IC2 recipe to GT + 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( - 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); - //noinspection UnstableApiUsage// Stable enough for this project + aThermalCentrifugeRecipeList, + GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes, + true, + true, + true); + // noinspection UnstableApiUsage// Stable enough for this project GT_Mod.GT_FML_LOGGER.info("IC2 Removal (" + stopwatch.stop() + "). Have a Cake."); } @@ -95,39 +102,47 @@ public class GT_PostLoad { ItemStack iSData0 = new ItemStack(Items.potionitem, 1, 0); ItemStack iLData0 = ItemList.Bottle_Empty.get(1L); - for (FluidContainerRegistry.FluidContainerData tData : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe( true, - new ItemStack[] {iLData0}, - new ItemStack[] {iSData0}, + new ItemStack[] { iLData0 }, + new ItemStack[] { iSData0 }, null, - new FluidStack[] {Materials.Water.getFluid(250L)}, + new FluidStack[] { Materials.Water.getFluid(250L) }, null, 4, 1, 0); GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe( - true, new ItemStack[] {iSData0}, new ItemStack[] {iLData0}, null, null, null, 4, 1, 0); + true, + new ItemStack[] { iSData0 }, + new ItemStack[] { iLData0 }, + null, + null, + null, + 4, + 1, + 0); } else { GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe( true, - new ItemStack[] {tData.emptyContainer}, - new ItemStack[] {tData.filledContainer}, + new ItemStack[] { tData.emptyContainer }, + new ItemStack[] { tData.filledContainer }, null, - new FluidStack[] {tData.fluid}, + new FluidStack[] { tData.fluid }, null, tData.fluid.amount / 62, 1, 0); GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe( true, - new ItemStack[] {tData.filledContainer}, - new ItemStack[] {GT_Utility.getContainerItem(tData.filledContainer, true)}, + new ItemStack[] { tData.filledContainer }, + new ItemStack[] { GT_Utility.getContainerItem(tData.filledContainer, true) }, null, null, - new FluidStack[] {tData.fluid}, + new FluidStack[] { tData.fluid }, tData.fluid.amount / 62, 1, 0); @@ -143,8 +158,8 @@ public class GT_PostLoad { if (ItemList.IC2_Crop_Seeds.get(1L) != null) { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, - new ItemStack[] {ItemList.IC2_Crop_Seeds.getWildcard(1L)}, - new ItemStack[] {ItemList.IC2_Crop_Seeds.getWithName(1L, "Scanned Seeds")}, + new ItemStack[] { ItemList.IC2_Crop_Seeds.getWildcard(1L) }, + new ItemStack[] { ItemList.IC2_Crop_Seeds.getWithName(1L, "Scanned Seeds") }, null, null, null, @@ -154,8 +169,8 @@ public class GT_PostLoad { } GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, - new ItemStack[] {new ItemStack(Items.written_book, 1, 32767)}, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Scanned Book Data")}, + new ItemStack[] { new ItemStack(Items.written_book, 1, 32767) }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Book Data") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, null, @@ -164,8 +179,8 @@ public class GT_PostLoad { 0); GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, - new ItemStack[] {new ItemStack(Items.filled_map, 1, 32767)}, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Scanned Map Data")}, + new ItemStack[] { new ItemStack(Items.filled_map, 1, 32767) }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Map Data") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, null, @@ -174,8 +189,8 @@ public class GT_PostLoad { 0); GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, - new ItemStack[] {ItemList.Tool_DataOrb.getWithName(1L, "Orb to overwrite")}, - new ItemStack[] {ItemList.Tool_DataOrb.getWithName(1L, "Copy of the Orb")}, + new ItemStack[] { ItemList.Tool_DataOrb.getWithName(1L, "Orb to overwrite") }, + new ItemStack[] { ItemList.Tool_DataOrb.getWithName(1L, "Copy of the Orb") }, ItemList.Tool_DataOrb.getWithName(0L, "Orb to copy"), null, null, @@ -184,8 +199,8 @@ public class GT_PostLoad { 0); GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Stick to overwrite")}, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Copy of the Stick")}, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Stick to overwrite") }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Copy of the Stick") }, ItemList.Tool_DataStick.getWithName(0L, "Stick to copy"), null, null, @@ -194,8 +209,8 @@ public class GT_PostLoad { 0); GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Raw Prospection Data")}, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Analyzed Prospection Data")}, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Raw Prospection Data") }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Analyzed Prospection Data") }, null, null, null, @@ -203,29 +218,26 @@ public class GT_PostLoad { 30, 0); if (Loader.isModLoaded("GalacticraftCore")) { - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( - false, - new ItemStack[] { - Objects.requireNonNull(GT_ModHandler.getModItem( - "GalacticraftCore", "item.schematic", 1, Short.MAX_VALUE)) - .setStackDisplayName("Any Schematic") - }, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic")}, - ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), - null, - null, - 36000, - 480, - 0); + GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes + .addFakeRecipe( + false, + new ItemStack[] { Objects.requireNonNull( + GT_ModHandler.getModItem("GalacticraftCore", "item.schematic", 1, Short.MAX_VALUE)) + .setStackDisplayName("Any Schematic") }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, + ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), + null, + null, + 36000, + 480, + 0); if (Loader.isModLoaded("GalacticraftMars")) GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, - new ItemStack[] { - Objects.requireNonNull(GT_ModHandler.getModItem( - "GalacticraftMars", "item.schematic", 1, Short.MAX_VALUE)) - .setStackDisplayName("Any Schematic") - }, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic")}, + new ItemStack[] { Objects.requireNonNull( + GT_ModHandler.getModItem("GalacticraftMars", "item.schematic", 1, Short.MAX_VALUE)) + .setStackDisplayName("Any Schematic") }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, null, @@ -236,11 +248,9 @@ public class GT_PostLoad { for (int i = 4; i < 9; i++) { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, - new ItemStack[] { - GT_ModHandler.getModItem("GalaxySpace", "item.SchematicTier" + i, 1) - .setStackDisplayName("Any Schematic") - }, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic")}, + new ItemStack[] { GT_ModHandler.getModItem("GalaxySpace", "item.SchematicTier" + i, 1) + .setStackDisplayName("Any Schematic") }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, null, @@ -251,16 +261,15 @@ public class GT_PostLoad { } } Materials.getMaterialsMap().values().forEach(tMaterial -> { - if ((tMaterial.mElement != null) - && (!tMaterial.mElement.mIsIsotope) + 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}; + ItemStack[] iSMat0 = new ItemStack[] { tInput }; + ItemStack[] iSMat1 = new ItemStack[] { tOutput }; if (tInput != null) { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, @@ -277,14 +286,14 @@ public class GT_PostLoad { null, iSMat0, iSMat1, - new FluidStack[] {Materials.UUMatter.getFluid(tMaterial.getMass())}, + new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, null, (int) (tMaterial.getMass() * 512L), (int) VP[1], 0); } tInput = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L); - iSMat0 = new ItemStack[] {tInput}; + iSMat0 = new ItemStack[] { tInput }; if (tInput != null) { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, @@ -301,7 +310,7 @@ public class GT_PostLoad { null, iSMat0, iSMat1, - new FluidStack[] {Materials.UUMatter.getFluid(tMaterial.getMass())}, + new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, null, (int) (tMaterial.getMass() * 512L), (int) VP[1], @@ -310,31 +319,30 @@ public class GT_PostLoad { } }); - 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); + 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( false, - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, null, null, - new FluidStack[] {Materials.UUAmplifier.getFluid(GT_MetaTileEntity_Massfabricator.sUUAperUUM)}, - new FluidStack[] {Materials.UUMatter.getFluid(1L)}, + new FluidStack[] { Materials.UUAmplifier.getFluid(GT_MetaTileEntity_Massfabricator.sUUAperUUM) }, + new FluidStack[] { Materials.UUMatter.getFluid(1L) }, GT_MetaTileEntity_Massfabricator.sDurationMultiplier / GT_MetaTileEntity_Massfabricator.sUUASpeedBonus, 256, 0); GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes.addFakeRecipe( false, - new ItemStack[] {ItemList.Display_ITS_FREE.getWithName(0L, "Place Lava on Side")}, - new ItemStack[] {new ItemStack(Blocks.cobblestone, 1)}, + new ItemStack[] { ItemList.Display_ITS_FREE.getWithName(0L, "Place Lava on Side") }, + new ItemStack[] { new ItemStack(Blocks.cobblestone, 1) }, null, null, null, @@ -343,8 +351,8 @@ public class GT_PostLoad { 0); GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes.addFakeRecipe( false, - new ItemStack[] {ItemList.Display_ITS_FREE.getWithName(0L, "Place Lava on Top")}, - new ItemStack[] {new ItemStack(Blocks.stone, 1)}, + new ItemStack[] { ItemList.Display_ITS_FREE.getWithName(0L, "Place Lava on Top") }, + new ItemStack[] { new ItemStack(Blocks.stone, 1) }, null, null, null, @@ -353,11 +361,9 @@ public class GT_PostLoad { 0); GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes.addFakeRecipe( false, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - GT_Utility.getIntegratedCircuit(1) - }, - new ItemStack[] {new ItemStack(Blocks.obsidian, 1)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + GT_Utility.getIntegratedCircuit(1) }, + new ItemStack[] { new ItemStack(Blocks.obsidian, 1) }, null, null, null, @@ -405,15 +411,13 @@ public class GT_PostLoad { @SuppressWarnings("UnstableApiUsage") // Stable enough for this project Stopwatch stopwatch = Stopwatch.createStarted(); GT_Mod.GT_FML_LOGGER.info("Replacing Vanilla Materials in recipes, please wait."); - Set<Materials> replaceVanillaItemsSet = GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList - ? Arrays.stream(Materials.values()) - .filter(GT_RecipeRegistrator::hasVanillaRecipes) - .collect(Collectors.toSet()) + Set<Materials> replaceVanillaItemsSet = GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList ? Arrays + .stream(Materials.values()).filter(GT_RecipeRegistrator::hasVanillaRecipes).collect(Collectors.toSet()) : new HashSet<>(Arrays.asList(Materials.values())); @SuppressWarnings("deprecation") // stable API for MC 1.7.10 - ProgressManager.ProgressBar progressBar = - ProgressManager.push("Register materials", replaceVanillaItemsSet.size()); + ProgressManager.ProgressBar progressBar = ProgressManager + .push("Register materials", replaceVanillaItemsSet.size()); if (GT_Values.cls_enabled) { try { GT_CLS_Compat.doActualRegistrationCLS(progressBar, replaceVanillaItemsSet); @@ -427,9 +431,9 @@ public class GT_PostLoad { doActualRegistration(m); }); } - //noinspection deprecation// stable API for MC 1.7.10 + // noinspection deprecation// stable API for MC 1.7.10 ProgressManager.pop(progressBar); - //noinspection UnstableApiUsage// stable enough for project + // noinspection UnstableApiUsage// stable enough for project GT_Mod.GT_FML_LOGGER.info("Replaced Vanilla Materials (" + stopwatch.stop() + "). Have a Cake."); } @@ -443,6 +447,7 @@ public class GT_PostLoad { public static void createGTtoolsCreativeTab() { new CreativeTabs("GTtools") { + @SideOnly(Side.CLIENT) @Override public ItemStack getIconItemStack() { @@ -460,23 +465,28 @@ public class GT_PostLoad { public void displayAllReleventItems(List aList) { for (int i = 0; i < 32766; i += 2) { - if (GT_MetaGenerated_Tool_01.INSTANCE.getToolStats( - new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i)) - != null) { + if (GT_MetaGenerated_Tool_01.INSTANCE + .getToolStats(new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i)) != null) { ItemStack tStack = new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i); GT_MetaGenerated_Tool_01.INSTANCE.isItemStackUsable(tStack); - aList.add(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - i, 1, Materials.Lead, Materials.Lead, null)); - aList.add(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - i, 1, Materials.Nickel, Materials.Nickel, null)); - aList.add(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - i, 1, Materials.Cobalt, Materials.Cobalt, null)); - aList.add(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - i, 1, Materials.Osmium, Materials.Osmium, null)); - aList.add(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - i, 1, Materials.Adamantium, Materials.Adamantium, null)); - aList.add(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - i, 1, Materials.Neutronium, Materials.Neutronium, null)); + aList.add( + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(i, 1, Materials.Lead, Materials.Lead, null)); + aList.add( + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(i, 1, Materials.Nickel, Materials.Nickel, null)); + aList.add( + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(i, 1, Materials.Cobalt, Materials.Cobalt, null)); + aList.add( + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(i, 1, Materials.Osmium, Materials.Osmium, null)); + aList.add( + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(i, 1, Materials.Adamantium, Materials.Adamantium, null)); + aList.add( + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(i, 1, Materials.Neutronium, Materials.Neutronium, null)); } } super.displayAllReleventItems(aList); @@ -510,24 +520,18 @@ public class GT_PostLoad { GT_OreDictUnificator.get(ItemList.Block_MSSFUEL.get(1)), GT_OreDictUnificator.get(OrePrefixes.rod, Materials.Blaze, 1)); if (Loader.isModLoaded("Thaumcraft")) { - GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels.addSolidRecipe( - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1)); + GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels + .addSolidRecipe(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1)); } } public static void identifyAnySteam() { - final String[] steamCandidates = {"steam", "ic2steam"}; - final String[] superHeatedSteamCandidates = {"ic2superheatedsteam"}; + final String[] steamCandidates = { "steam", "ic2steam" }; + final String[] superHeatedSteamCandidates = { "ic2superheatedsteam" }; - GT_ModHandler.sAnySteamFluidIDs = Arrays.stream(steamCandidates) - .map(FluidRegistry::getFluid) - .filter(Objects::nonNull) - .map(FluidRegistry::getFluidID) - .collect(Collectors.toList()); - GT_ModHandler.sSuperHeatedSteamFluidIDs = Arrays.stream(superHeatedSteamCandidates) - .map(FluidRegistry::getFluid) - .filter(Objects::nonNull) - .map(FluidRegistry::getFluidID) - .collect(Collectors.toList()); + GT_ModHandler.sAnySteamFluidIDs = Arrays.stream(steamCandidates).map(FluidRegistry::getFluid) + .filter(Objects::nonNull).map(FluidRegistry::getFluidID).collect(Collectors.toList()); + GT_ModHandler.sSuperHeatedSteamFluidIDs = Arrays.stream(superHeatedSteamCandidates).map(FluidRegistry::getFluid) + .filter(Objects::nonNull).map(FluidRegistry::getFluidID).collect(Collectors.toList()); } } diff --git a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java index b758ab2004..431b89c663 100644 --- a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java @@ -24,16 +24,16 @@ public class GT_ProcessingArrayRecipeLoader { // Canner GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.canner", GT_Recipe_Map.sCannerRecipes); // Centrifuge - GT_ProcessingArray_Manager.addRecipeMapToPA( - "basicmachine.centrifuge", GT_Recipe_Map.sMultiblockCentrifugeRecipes); + GT_ProcessingArray_Manager + .addRecipeMapToPA("basicmachine.centrifuge", GT_Recipe_Map.sMultiblockCentrifugeRecipes); // Chemical Bath GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.chemicalbath", GT_Recipe_Map.sChemicalBathRecipes); // Chemical Reactor - GT_ProcessingArray_Manager.addRecipeMapToPA( - "basicmachine.chemicalreactor", GT_Recipe_Map.sMultiblockChemicalRecipes); + GT_ProcessingArray_Manager + .addRecipeMapToPA("basicmachine.chemicalreactor", GT_Recipe_Map.sMultiblockChemicalRecipes); // Circuit Assembler - GT_ProcessingArray_Manager.addRecipeMapToPA( - "basicmachine.circuitassembler", GT_Recipe_Map.sCircuitAssemblerRecipes); + GT_ProcessingArray_Manager + .addRecipeMapToPA("basicmachine.circuitassembler", GT_Recipe_Map.sCircuitAssemblerRecipes); // Compressor GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.compressor", GT_Recipe_Map.sCompressorRecipes); // Cutting Machine @@ -41,8 +41,8 @@ public class GT_ProcessingArrayRecipeLoader { // Distillery GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.distillery", GT_Recipe_Map.sDistilleryRecipes); // Electrolyzer - GT_ProcessingArray_Manager.addRecipeMapToPA( - "basicmachine.electrolyzer", GT_Recipe_Map.sMultiblockElectrolyzerRecipes); + GT_ProcessingArray_Manager + .addRecipeMapToPA("basicmachine.electrolyzer", GT_Recipe_Map.sMultiblockElectrolyzerRecipes); // Extractor GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extractor", GT_Recipe_Map.sExtractorRecipes); // Extruder @@ -52,13 +52,13 @@ public class GT_ProcessingArrayRecipeLoader { // Fluid Canner GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidcanner", GT_Recipe_Map.sFluidCannerRecipes); // Fluid Extractor - GT_ProcessingArray_Manager.addRecipeMapToPA( - "basicmachine.fluidextractor", GT_Recipe_Map.sFluidExtractionRecipes); + GT_ProcessingArray_Manager + .addRecipeMapToPA("basicmachine.fluidextractor", GT_Recipe_Map.sFluidExtractionRecipes); // Fluid Heater GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidheater", GT_Recipe_Map.sFluidHeaterRecipes); // Fluid Solidifier - GT_ProcessingArray_Manager.addRecipeMapToPA( - "basicmachine.fluidsolidifier", GT_Recipe_Map.sFluidSolidficationRecipes); + GT_ProcessingArray_Manager + .addRecipeMapToPA("basicmachine.fluidsolidifier", GT_Recipe_Map.sFluidSolidficationRecipes); // Forge Hammer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.hammer", GT_Recipe_Map.sHammerRecipes); // Forming Press @@ -71,7 +71,8 @@ public class GT_ProcessingArrayRecipeLoader { GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.macerator", GT_Recipe_Map.sMaceratorRecipes); // Magnetic Separator GT_ProcessingArray_Manager.addRecipeMapToPA( - "basicmachine.electromagneticseparator", GT_Recipe_Map.sElectroMagneticSeparatorRecipes); + "basicmachine.electromagneticseparator", + GT_Recipe_Map.sElectroMagneticSeparatorRecipes); // Matter Amplifier GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.amplifab", GT_Recipe_Map.sAmplifiers); // Microwave @@ -81,8 +82,8 @@ public class GT_ProcessingArrayRecipeLoader { // Ore Washer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.orewasher", GT_Recipe_Map.sOreWasherRecipes); // Plasma Arc Furnace - GT_ProcessingArray_Manager.addRecipeMapToPA( - "basicmachine.plasmaarcfurnace", GT_Recipe_Map.sPlasmaArcFurnaceRecipes); + GT_ProcessingArray_Manager + .addRecipeMapToPA("basicmachine.plasmaarcfurnace", GT_Recipe_Map.sPlasmaArcFurnaceRecipes); // Polarizer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.polarizer", GT_Recipe_Map.sPolarizerRecipes); // Printer @@ -96,8 +97,8 @@ public class GT_ProcessingArrayRecipeLoader { // Slicer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.slicer", GT_Recipe_Map.sSlicerRecipes); // Thermal Centrifuge - GT_ProcessingArray_Manager.addRecipeMapToPA( - "basicmachine.thermalcentrifuge", GT_Recipe_Map.sThermalCentrifugeRecipes); + GT_ProcessingArray_Manager + .addRecipeMapToPA("basicmachine.thermalcentrifuge", GT_Recipe_Map.sThermalCentrifugeRecipes); // Unboxinator GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.unboxinator", GT_Recipe_Map.sUnboxinatorRecipes); // Wiremill diff --git a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java index 2a96ccbf25..7c72cf43f3 100644 --- a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java @@ -1,15 +1,17 @@ package gregtech.loaders.postload; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.ItemList; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class GT_RecyclerBlacklistLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Adding Stuff to the Recycler Blacklist."); @@ -28,8 +30,8 @@ public class GT_RecyclerBlacklistLoader implements Runnable { ItemStack tStack = new ItemStack(Blocks.cobblestone, 1, 0); while (tStack != null) { GT_ModHandler.addToRecyclerBlackList(tStack); - tStack = GT_ModHandler.getRecipeOutput( - tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack); + tStack = GT_ModHandler + .getRecipeOutput(tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack); } GT_ModHandler.addToRecyclerBlackList(new ItemStack(Blocks.gravel, 1, 32767)); GT_ModHandler.addToRecyclerBlackList(new ItemStack(Items.flint, 1, 32767)); @@ -39,44 +41,63 @@ public class GT_RecyclerBlacklistLoader implements Runnable { GT_ModHandler.addToRecyclerBlackList(new ItemStack(Blocks.stone_brick_stairs, 1, 32767)); GT_ModHandler.addToRecyclerBlackList( GT_ModHandler.getSmeltingOutput(new ItemStack(Blocks.stone, 1, 0), false, null)); - GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.glass, 1, 0), null, null, new ItemStack(Blocks.glass, 1, 0))); - GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.stone, 1, 0), null, null, new ItemStack(Blocks.stone, 1, 0))); - GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.cobblestone, 1, 0), null, null, new ItemStack(Blocks.cobblestone, 1, 0))); - GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.stone, 1, 0), - null, - new ItemStack(Blocks.stone, 1, 0), - null, - new ItemStack(Blocks.stone, 1, 0))); - GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.stone, 1, 0), - new ItemStack(Blocks.glass, 1, 0), - new ItemStack(Blocks.stone, 1, 0))); - GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.cobblestone, 1, 0), - new ItemStack(Blocks.glass, 1, 0), - new ItemStack(Blocks.cobblestone, 1, 0))); - GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.glass, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0))); - GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.sand, 1, 0), - new ItemStack(Blocks.glass, 1, 0), - new ItemStack(Blocks.sand, 1, 0))); - GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0))); + GT_ModHandler.addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.glass, 1, 0), + null, + null, + new ItemStack(Blocks.glass, 1, 0))); + GT_ModHandler.addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.stone, 1, 0), + null, + null, + new ItemStack(Blocks.stone, 1, 0))); + GT_ModHandler.addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.cobblestone, 1, 0), + null, + null, + new ItemStack(Blocks.cobblestone, 1, 0))); + GT_ModHandler.addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.stone, 1, 0), + null, + new ItemStack(Blocks.stone, 1, 0), + null, + new ItemStack(Blocks.stone, 1, 0))); + GT_ModHandler.addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.stone, 1, 0), + new ItemStack(Blocks.glass, 1, 0), + new ItemStack(Blocks.stone, 1, 0))); + GT_ModHandler.addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.cobblestone, 1, 0), + new ItemStack(Blocks.glass, 1, 0), + new ItemStack(Blocks.cobblestone, 1, 0))); + GT_ModHandler.addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.glass, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0))); + GT_ModHandler.addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.sand, 1, 0), + new ItemStack(Blocks.glass, 1, 0), + new ItemStack(Blocks.sand, 1, 0))); + GT_ModHandler.addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0))); GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0))); - GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0))); + GT_ModHandler.addToRecyclerBlackList( + GT_ModHandler + .getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0))); } } } diff --git a/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java b/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java index 842cfd3a77..b4621df6b6 100644 --- a/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java @@ -1,5 +1,9 @@ package gregtech.loaders.postload; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.GT_Mod; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -7,11 +11,9 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class GT_ScrapboxDropLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: (re-)adding Scrapbox Drops."); diff --git a/src/main/java/gregtech/loaders/postload/GT_UUMRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_UUMRecipeLoader.java index fb8d530e72..bf2c2c4ebb 100644 --- a/src/main/java/gregtech/loaders/postload/GT_UUMRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_UUMRecipeLoader.java @@ -1,6 +1,7 @@ package gregtech.loaders.postload; public class GT_UUMRecipeLoader implements Runnable { + @Override public void run() {} } diff --git a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java index 0fc7552ba3..19d03c7f4c 100644 --- a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java +++ b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java @@ -1,5 +1,8 @@ package gregtech.loaders.postload; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; + import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.util.GT_Log; @@ -7,8 +10,6 @@ import gregtech.common.GT_Worldgen_GT_Ore_Layer; import gregtech.common.GT_Worldgen_GT_Ore_SmallPieces; import gregtech.common.GT_Worldgen_Stone; import gregtech.common.GT_Worldgenerator; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; public class GT_Worldgenloader implements Runnable { @@ -149,9 +150,31 @@ public class GT_Worldgenloader implements Runnable { false); new GT_Worldgen_Stone( - "overworld.stone.marble.tiny", true, GregTech_API.sBlockStones, 0, 0, 1, 75, 5, 0, 180, null, false); + "overworld.stone.marble.tiny", + true, + GregTech_API.sBlockStones, + 0, + 0, + 1, + 75, + 5, + 0, + 180, + null, + false); new GT_Worldgen_Stone( - "overworld.stone.marble.small", true, GregTech_API.sBlockStones, 0, 0, 1, 100, 10, 0, 180, null, false); + "overworld.stone.marble.small", + true, + GregTech_API.sBlockStones, + 0, + 0, + 1, + 100, + 10, + 0, + 180, + null, + false); new GT_Worldgen_Stone( "overworld.stone.marble.medium", true, @@ -166,14 +189,58 @@ public class GT_Worldgenloader implements Runnable { null, false); new GT_Worldgen_Stone( - "overworld.stone.marble.large", true, GregTech_API.sBlockStones, 0, 0, 1, 300, 70, 0, 120, null, false); + "overworld.stone.marble.large", + true, + GregTech_API.sBlockStones, + 0, + 0, + 1, + 300, + 70, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "overworld.stone.marble.huge", true, GregTech_API.sBlockStones, 0, 0, 1, 400, 150, 0, 120, null, false); + "overworld.stone.marble.huge", + true, + GregTech_API.sBlockStones, + 0, + 0, + 1, + 400, + 150, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "overworld.stone.basalt.tiny", true, GregTech_API.sBlockStones, 8, 0, 1, 75, 5, 0, 180, null, false); + "overworld.stone.basalt.tiny", + true, + GregTech_API.sBlockStones, + 8, + 0, + 1, + 75, + 5, + 0, + 180, + null, + false); new GT_Worldgen_Stone( - "overworld.stone.basalt.small", true, GregTech_API.sBlockStones, 8, 0, 1, 100, 10, 0, 180, null, false); + "overworld.stone.basalt.small", + true, + GregTech_API.sBlockStones, + 8, + 0, + 1, + 100, + 10, + 0, + 180, + null, + false); new GT_Worldgen_Stone( "overworld.stone.basalt.medium", true, @@ -188,9 +255,31 @@ public class GT_Worldgenloader implements Runnable { null, false); new GT_Worldgen_Stone( - "overworld.stone.basalt.large", true, GregTech_API.sBlockStones, 8, 0, 1, 300, 70, 0, 120, null, false); + "overworld.stone.basalt.large", + true, + GregTech_API.sBlockStones, + 8, + 0, + 1, + 300, + 70, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "overworld.stone.basalt.huge", true, GregTech_API.sBlockStones, 8, 0, 1, 400, 150, 0, 120, null, false); + "overworld.stone.basalt.huge", + true, + GregTech_API.sBlockStones, + 8, + 0, + 1, + 400, + 150, + 0, + 120, + null, + false); new GT_Worldgen_Stone( "nether.stone.blackgranite.tiny", @@ -325,58 +414,333 @@ public class GT_Worldgenloader implements Runnable { false); new GT_Worldgen_Stone( - "nether.stone.marble.tiny", false, GregTech_API.sBlockStones, 0, -1, 1, 50, 45, 0, 120, null, false); + "nether.stone.marble.tiny", + false, + GregTech_API.sBlockStones, + 0, + -1, + 1, + 50, + 45, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "nether.stone.marble.small", false, GregTech_API.sBlockStones, 0, -1, 1, 100, 60, 0, 120, null, false); + "nether.stone.marble.small", + false, + GregTech_API.sBlockStones, + 0, + -1, + 1, + 100, + 60, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "nether.stone.marble.medium", false, GregTech_API.sBlockStones, 0, -1, 1, 200, 80, 0, 120, null, false); + "nether.stone.marble.medium", + false, + GregTech_API.sBlockStones, + 0, + -1, + 1, + 200, + 80, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "nether.stone.marble.large", false, GregTech_API.sBlockStones, 0, -1, 1, 300, 70, 0, 120, null, false); + "nether.stone.marble.large", + false, + GregTech_API.sBlockStones, + 0, + -1, + 1, + 300, + 70, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "nether.stone.marble.huge", false, GregTech_API.sBlockStones, 0, -1, 1, 400, 150, 0, 120, null, false); + "nether.stone.marble.huge", + false, + GregTech_API.sBlockStones, + 0, + -1, + 1, + 400, + 150, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "nether.stone.basalt.tiny", false, GregTech_API.sBlockStones, 8, -1, 1, 50, 45, 0, 120, null, false); + "nether.stone.basalt.tiny", + false, + GregTech_API.sBlockStones, + 8, + -1, + 1, + 50, + 45, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "nether.stone.basalt.small", false, GregTech_API.sBlockStones, 8, -1, 1, 100, 60, 0, 120, null, false); + "nether.stone.basalt.small", + false, + GregTech_API.sBlockStones, + 8, + -1, + 1, + 100, + 60, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "nether.stone.basalt.medium", false, GregTech_API.sBlockStones, 8, -1, 1, 200, 80, 0, 120, null, false); + "nether.stone.basalt.medium", + false, + GregTech_API.sBlockStones, + 8, + -1, + 1, + 200, + 80, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "nether.stone.basalt.large", false, GregTech_API.sBlockStones, 8, -1, 1, 300, 70, 0, 120, null, false); + "nether.stone.basalt.large", + false, + GregTech_API.sBlockStones, + 8, + -1, + 1, + 300, + 70, + 0, + 120, + null, + false); new GT_Worldgen_Stone( - "nether.stone.basalt.huge", false, GregTech_API.sBlockStones, 8, -1, 1, 400, 150, 0, 120, null, false); + "nether.stone.basalt.huge", + false, + GregTech_API.sBlockStones, + 8, + -1, + 1, + 400, + 150, + 0, + 120, + null, + false); // GT Default Small Ores new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.copper", true, 60, 180, 32, true, true, true, true, true, false, Materials.Copper); + "ore.small.copper", + true, + 60, + 180, + 32, + true, + true, + true, + true, + true, + false, + Materials.Copper); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.tin", true, 80, 220, 32, true, true, true, true, true, true, Materials.Tin); + "ore.small.tin", + true, + 80, + 220, + 32, + true, + true, + true, + true, + true, + true, + Materials.Tin); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.bismuth", true, 80, 120, 8, false, true, false, true, true, false, Materials.Bismuth); + "ore.small.bismuth", + true, + 80, + 120, + 8, + false, + true, + false, + true, + true, + false, + Materials.Bismuth); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.coal", true, 120, 250, 24, true, false, false, false, false, false, Materials.Coal); + "ore.small.coal", + true, + 120, + 250, + 24, + true, + false, + false, + false, + false, + false, + Materials.Coal); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.iron", true, 40, 100, 16, true, true, true, true, true, false, Materials.Iron); + "ore.small.iron", + true, + 40, + 100, + 16, + true, + true, + true, + true, + true, + false, + Materials.Iron); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.lead", true, 40, 180, 16, false, true, true, true, true, true, Materials.Lead); + "ore.small.lead", + true, + 40, + 180, + 16, + false, + true, + true, + true, + true, + true, + Materials.Lead); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.zinc", true, 80, 210, 24, true, true, true, true, true, false, Materials.Zinc); + "ore.small.zinc", + true, + 80, + 210, + 24, + true, + true, + true, + true, + true, + false, + Materials.Zinc); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.gold", true, 20, 60, 8, true, false, true, true, true, true, Materials.Gold); + "ore.small.gold", + true, + 20, + 60, + 8, + true, + false, + true, + true, + true, + true, + Materials.Gold); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.silver", true, 20, 60, 20, true, true, true, true, true, true, Materials.Silver); + "ore.small.silver", + true, + 20, + 60, + 20, + true, + true, + true, + true, + true, + true, + Materials.Silver); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.nickel", true, 80, 150, 8, true, false, true, true, true, true, Materials.Nickel); + "ore.small.nickel", + true, + 80, + 150, + 8, + true, + false, + true, + true, + true, + true, + Materials.Nickel); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.lapis", true, 10, 50, 4, true, false, false, true, false, true, Materials.Lapis); + "ore.small.lapis", + true, + 10, + 50, + 4, + true, + false, + false, + true, + false, + true, + Materials.Lapis); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.diamond", true, 5, 15, 2, true, false, false, true, true, true, Materials.Diamond); + "ore.small.diamond", + true, + 5, + 15, + 2, + true, + false, + false, + true, + true, + true, + Materials.Diamond); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.emerald", true, 5, 35, 2, false, false, false, false, true, true, Materials.Emerald); + "ore.small.emerald", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.Emerald); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.ruby", true, 5, 35, 2, false, false, false, false, true, true, Materials.Ruby); + "ore.small.ruby", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.Ruby); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.sapphire", true, 5, 35, 2, false, false, false, false, true, true, Materials.Sapphire); + "ore.small.sapphire", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.Sapphire); new GT_Worldgen_GT_Ore_SmallPieces( "ore.small.greensapphire", true, @@ -391,25 +755,135 @@ public class GT_Worldgenloader implements Runnable { true, Materials.GreenSapphire); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.olivine", true, 5, 35, 2, false, false, false, false, true, true, Materials.Olivine); + "ore.small.olivine", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.Olivine); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.topaz", true, 5, 35, 2, false, false, false, false, true, true, Materials.Topaz); + "ore.small.topaz", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.Topaz); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.tanzanite", true, 5, 35, 2, false, false, false, false, true, true, Materials.Tanzanite); + "ore.small.tanzanite", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.Tanzanite); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.amethyst", true, 5, 35, 2, false, false, false, false, true, true, Materials.Amethyst); + "ore.small.amethyst", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.Amethyst); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.opal", true, 5, 35, 2, false, false, false, false, true, true, Materials.Opal); + "ore.small.opal", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.Opal); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.jasper", true, 5, 35, 2, false, false, false, false, true, true, Materials.Jasper); + "ore.small.jasper", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.Jasper); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.bluetopaz", true, 5, 35, 2, false, false, false, false, true, true, Materials.BlueTopaz); + "ore.small.bluetopaz", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.BlueTopaz); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.amber", true, 5, 35, 2, false, false, false, false, true, true, Materials.Amber); + "ore.small.amber", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.Amber); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.foolsruby", true, 5, 35, 2, false, false, false, false, true, true, Materials.FoolsRuby); + "ore.small.foolsruby", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.FoolsRuby); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.garnetred", true, 5, 35, 2, false, false, false, false, true, true, Materials.GarnetRed); + "ore.small.garnetred", + true, + 5, + 35, + 2, + false, + false, + false, + false, + true, + true, + Materials.GarnetRed); new GT_Worldgen_GT_Ore_SmallPieces( "ore.small.garnetyellow", true, @@ -424,7 +898,18 @@ public class GT_Worldgenloader implements Runnable { true, Materials.GarnetYellow); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.redstone", true, 5, 25, 8, true, true, false, true, true, true, Materials.Redstone); + "ore.small.redstone", + true, + 5, + 25, + 8, + true, + true, + false, + true, + true, + true, + Materials.Redstone); new GT_Worldgen_GT_Ore_SmallPieces( "ore.small.netherquartz", true, @@ -439,53 +924,227 @@ public class GT_Worldgenloader implements Runnable { false, Materials.NetherQuartz); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.saltpeter", true, 10, 60, 8, false, true, false, false, false, false, Materials.Saltpeter); + "ore.small.saltpeter", + true, + 10, + 60, + 8, + false, + true, + false, + false, + false, + false, + Materials.Saltpeter); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.sulfur", true, 5, 60, 40, false, true, false, false, false, false, Materials.Sulfur); + "ore.small.sulfur", + true, + 5, + 60, + 40, + false, + true, + false, + false, + false, + false, + Materials.Sulfur); // TODO: GTNH Custom Small Ores new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.titanium", true, 10, 180, 32, false, false, false, Materials.Titanium); + "ore.small.titanium", + true, + 10, + 180, + 32, + false, + false, + false, + Materials.Titanium); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.tungsten", true, 10, 120, 16, false, false, false, Materials.Tungsten); + "ore.small.tungsten", + true, + 10, + 120, + 16, + false, + false, + false, + Materials.Tungsten); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.meteoriciron", true, 50, 70, 8, false, false, false, Materials.MeteoricIron); + "ore.small.meteoriciron", + true, + 50, + 70, + 8, + false, + false, + false, + Materials.MeteoricIron); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.firestone", true, 5, 15, 2, false, false, false, Materials.Firestone); + "ore.small.firestone", + true, + 5, + 15, + 2, + false, + false, + false, + Materials.Firestone); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.neutronium", true, 5, 15, 8, false, false, false, Materials.Neutronium); + "ore.small.neutronium", + true, + 5, + 15, + 8, + false, + false, + false, + Materials.Neutronium); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.chromite", true, 20, 40, 8, false, false, false, Materials.Chromite); + "ore.small.chromite", + true, + 20, + 40, + 8, + false, + false, + false, + Materials.Chromite); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.tungstate", true, 20, 40, 8, false, false, false, Materials.Tungstate); + "ore.small.tungstate", + true, + 20, + 40, + 8, + false, + false, + false, + Materials.Tungstate); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.naquadah", true, 5, 25, 8, false, false, false, Materials.Naquadah); + "ore.small.naquadah", + true, + 5, + 25, + 8, + false, + false, + false, + Materials.Naquadah); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.quantium", true, 5, 25, 6, false, false, false, Materials.Quantium); + "ore.small.quantium", + true, + 5, + 25, + 6, + false, + false, + false, + Materials.Quantium); new GT_Worldgen_GT_Ore_SmallPieces("ore.small.mythril", true, 5, 25, 6, false, false, false, Materials.Mytryl); new GT_Worldgen_GT_Ore_SmallPieces("ore.small.ledox", true, 40, 60, 4, false, false, false, Materials.Ledox); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.oriharukon", true, 20, 40, 6, false, false, false, Materials.Oriharukon); + "ore.small.oriharukon", + true, + 20, + 40, + 6, + false, + false, + false, + Materials.Oriharukon); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.draconium", true, 5, 15, 4, false, false, false, Materials.Draconium); + "ore.small.draconium", + true, + 5, + 15, + 4, + false, + false, + false, + Materials.Draconium); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.awdraconium", true, 5, 15, 2, false, false, false, Materials.DraconiumAwakened); + "ore.small.awdraconium", + true, + 5, + 15, + 2, + false, + false, + false, + Materials.DraconiumAwakened); new GT_Worldgen_GT_Ore_SmallPieces("ore.small.desh", true, 10, 30, 6, false, false, false, Materials.Desh); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.blackplutonium", true, 25, 45, 6, false, false, false, Materials.BlackPlutonium); + "ore.small.blackplutonium", + true, + 25, + 45, + 6, + false, + false, + false, + Materials.BlackPlutonium); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.infinitycatalyst", true, 40, 80, 6, false, false, false, Materials.InfinityCatalyst); + "ore.small.infinitycatalyst", + true, + 40, + 80, + 6, + false, + false, + false, + Materials.InfinityCatalyst); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.infinity", true, 2, 40, 2, false, false, false, Materials.Infinity); + "ore.small.infinity", + true, + 2, + 40, + 2, + false, + false, + false, + Materials.Infinity); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.bedrockium", true, 5, 25, 6, false, false, false, Materials.Bedrockium); + "ore.small.bedrockium", + true, + 5, + 25, + 6, + false, + false, + false, + Materials.Bedrockium); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.realgar", true, 15, 85, 32, false, true, false, Materials.Realgar); + "ore.small.realgar", + true, + 15, + 85, + 32, + false, + true, + false, + Materials.Realgar); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.certusquartz", true, 5, 115, 16, false, true, false, Materials.CertusQuartz); + "ore.small.certusquartz", + true, + 5, + 115, + 16, + false, + true, + false, + Materials.CertusQuartz); new GT_Worldgen_GT_Ore_SmallPieces("ore.small.jade", true, 5, 35, 2, false, false, false, Materials.Jade); new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.deepiron", true, 5, 40, 8, false, false, false, Materials.DeepIron); + "ore.small.deepiron", + true, + 5, + 40, + 8, + false, + false, + false, + Materials.DeepIron); // GT Default Veins @@ -971,9 +1630,8 @@ public class GT_Worldgenloader implements Runnable { Materials.Oilsands); /* - * TODO: custom GTNH OreMixes - * WARNING: NO DUPLICATES IN aName OR DEPRECATED MATERIALS IN HERE. - * Materials can be used unlimited, since achievements for Ores are turned off. + * TODO: custom GTNH OreMixes WARNING: NO DUPLICATES IN aName OR DEPRECATED MATERIALS IN HERE. Materials can be + * used unlimited, since achievements for Ores are turned off. */ // aName, aDefault, aMinY, aMaxY, aWeight, aDensity, aSize, aOverworld, aNether, aEnd, aPrimary, aSecondary, diff --git a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java index 12b8e5cf6a..9b20da4727 100644 --- a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java +++ b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java @@ -1,5 +1,12 @@ package gregtech.loaders.postload; +import java.lang.reflect.Field; + +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + import appeng.api.networking.IGridNode; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; @@ -9,13 +16,9 @@ import appeng.parts.p2p.PartP2PIC2Power; import gregtech.api.interfaces.tileentity.IEnergyConnected; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; -import java.lang.reflect.Field; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable { + public PartP2PGTPower(ItemStack is) { super(is); } @@ -67,9 +70,7 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable { if (voltage > getOfferedEnergy()) { voltage = (long) getOfferedEnergy(); } - if (((IEnergyConnected) t) - .injectEnergyUnits( - GT_Utility.getOppositeSide(getSide().ordinal()), voltage, 1) + if (((IEnergyConnected) t).injectEnergyUnits(GT_Utility.getOppositeSide(getSide().ordinal()), voltage, 1) > 0) { drawEnergy(voltage); return true; 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 7dcfbee97f..fec3a30ad1 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java @@ -1,11 +1,12 @@ package gregtech.loaders.postload.chains; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class GT_BauxiteRefineChain { @@ -42,22 +43,13 @@ public class GT_BauxiteRefineChain { 400); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - Materials.Aluminiumhydroxide.getDust(1), - }, - new FluidStack[] { - Materials.CarbonDioxide.getGas(5000), MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(8000) - }, - new FluidStack[] { - MaterialsOreAlum.SluiceJuice.getFluid(5000), - }, - new ItemStack[] { - Materials.Aluminiumoxide.getDust(64), - Materials.Aluminiumoxide.getDust(16), - Materials.SodiumCarbonate.getDust(9), - Materials.Calcite.getDust(10), - MaterialsOreAlum.BauxiteSlag.getDust(16) - }, + new ItemStack[] { Materials.Aluminiumhydroxide.getDust(1), }, + new FluidStack[] { Materials.CarbonDioxide.getGas(5000), + MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(8000) }, + new FluidStack[] { MaterialsOreAlum.SluiceJuice.getFluid(5000), }, + new ItemStack[] { Materials.Aluminiumoxide.getDust(64), Materials.Aluminiumoxide.getDust(16), + Materials.SodiumCarbonate.getDust(9), Materials.Calcite.getDust(10), + MaterialsOreAlum.BauxiteSlag.getDust(16) }, 300, 480); @@ -72,7 +64,7 @@ public class GT_BauxiteRefineChain { Materials.SiliconDioxide.getDust(1), Materials.Iron.getDust(1), GT_Values.NI, - new int[] {8000, 6000, 2000, 9000, 8000}, + new int[] { 8000, 6000, 2000, 9000, 8000 }, 40, 120); @@ -83,7 +75,7 @@ public class GT_BauxiteRefineChain { Materials.Rutile.getDust(1), MaterialsOreAlum.IlmeniteSlag.getDust(1), GT_Values.NI, - new int[] {8500, 3000}, + new int[] { 8500, 3000 }, 420, 1000); @@ -94,7 +86,7 @@ public class GT_BauxiteRefineChain { Materials.Rutile.getDust(1), MaterialsOreAlum.IlmeniteSlag.getDust(1), GT_Values.NI, - new int[] {8500, 6000}, + new int[] { 8500, 6000 }, 420, 1000); @@ -109,13 +101,12 @@ public class GT_BauxiteRefineChain { Materials.Manganese.getDust(1), Materials.Magnesium.getDust(1), GT_Values.NI, - new int[] {8000, 1000, 2000, 5000, 6000}, + new int[] { 8000, 1000, 2000, 5000, 6000 }, 40, 120); - OrePrefixes[] washable = new OrePrefixes[] { - OrePrefixes.crushed, OrePrefixes.crushedPurified, OrePrefixes.dustImpure, OrePrefixes.dustPure - }; + OrePrefixes[] washable = new OrePrefixes[] { OrePrefixes.crushed, OrePrefixes.crushedPurified, + OrePrefixes.dustImpure, OrePrefixes.dustPure }; for (OrePrefixes ore : washable) { GT_Values.RA.addMixerRecipe( @@ -163,7 +154,7 @@ public class GT_BauxiteRefineChain { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Magnesium, 1), null, null, - new int[] {10000, 2000, 2000, 2000}, + new int[] { 10000, 2000, 2000, 2000 }, 45, 100); @@ -178,7 +169,7 @@ public class GT_BauxiteRefineChain { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Manganese, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Beryllium, 1), null, - new int[] {10000, 2000, 2000, 2000, 2000}, + new int[] { 10000, 2000, 2000, 2000, 2000 }, 45, 100); @@ -193,7 +184,7 @@ public class GT_BauxiteRefineChain { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Magnesium, 1), null, - new int[] {10000, 10000, 2000, 2000, 2000}, + new int[] { 10000, 10000, 2000, 2000, 2000 }, 45, 100); @@ -208,7 +199,7 @@ public class GT_BauxiteRefineChain { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - new int[] {5000, 4000, 2000, 2000, 2000, 2000}, + new int[] { 5000, 4000, 2000, 2000, 2000, 2000 }, 45, 120); @@ -223,7 +214,7 @@ public class GT_BauxiteRefineChain { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Chrome, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - new int[] {5000, 4000, 2000, 2000, 2000, 2000}, + new int[] { 5000, 4000, 2000, 2000, 2000, 2000 }, 45, 120); @@ -238,7 +229,7 @@ public class GT_BauxiteRefineChain { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Magnesium, 1), - new int[] {5000, 4000, 2000, 2000, 2000, 2000}, + new int[] { 5000, 4000, 2000, 2000, 2000, 2000 }, 45, 120); @@ -253,7 +244,7 @@ public class GT_BauxiteRefineChain { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Aluminiumoxide, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - new int[] {5000, 4000, 2000, 2000, 2000, 2000}, + new int[] { 5000, 4000, 2000, 2000, 2000, 2000 }, 45, 120); @@ -268,7 +259,7 @@ public class GT_BauxiteRefineChain { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Aluminiumoxide, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Manganese, 1), - new int[] {5000, 1000, 2000, 2000, 2000, 2000}, + new int[] { 5000, 1000, 2000, 2000, 2000, 2000 }, 45, 120); @@ -283,7 +274,7 @@ public class GT_BauxiteRefineChain { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - new int[] {5000, 4000, 2000, 2000, 2000, 2000}, + new int[] { 5000, 4000, 2000, 2000, 2000, 2000 }, 45, 120); } 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 3047938783..3f0f913dc4 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -4,15 +4,16 @@ import static gregtech.api.enums.GT_Values.MOD_ID_DC; import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; import static gregtech.api.util.GT_ModHandler.getModItem; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class GT_NaniteChain { @@ -32,20 +33,13 @@ public class GT_NaniteChain { GT_Values.RA.addAssemblylineRecipe( Materials.Carbon.getNanite(1), 3600 * 20, - new Object[] { - ItemList.Hull_UV.get(16), - Materials.Carbon.getNanite(16), - ItemList.Field_Generator_ZPM.get(16), - ItemList.Conveyor_Module_UV.get(16), - ItemList.Electric_Motor_UV.get(32), - new Object[] {OrePrefixes.circuit.get(Materials.Master), 16}, - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 32) - }, - new FluidStack[] { - new FluidStack(solderIndalloy, 144 * 32), - Materials.HSSS.getMolten(144L * 32), - Materials.Osmiridium.getMolten(144L * 16) - }, + new Object[] { ItemList.Hull_UV.get(16), Materials.Carbon.getNanite(16), + ItemList.Field_Generator_ZPM.get(16), ItemList.Conveyor_Module_UV.get(16), + ItemList.Electric_Motor_UV.get(32), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 16 }, + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 32) }, + new FluidStack[] { new FluidStack(solderIndalloy, 144 * 32), Materials.HSSS.getMolten(144L * 32), + Materials.Osmiridium.getMolten(144L * 16) }, ItemList.NanoForge.get(1), 2400 * 20, (int) GT_Values.VP[7]); @@ -53,38 +47,29 @@ public class GT_NaniteChain { GT_Values.RA.addAssemblylineRecipe( ItemList.Circuit_Crystalmainframe.get(1), 144000, - new Object[] { - new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 16}, - ItemList.Robot_Arm_UV.get(16), - ItemList.Circuit_Chip_Stemcell.get(32), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 16), - Materials.Carbon.getDust(64) - }, - new FluidStack[] {Materials.UUMatter.getFluid(10000), new FluidStack(solderIndalloy, 144 * 32)}, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 16 }, + ItemList.Robot_Arm_UV.get(16), ItemList.Circuit_Chip_Stemcell.get(32), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 16), + Materials.Carbon.getDust(64) }, + new FluidStack[] { Materials.UUMatter.getFluid(10000), new FluidStack(solderIndalloy, 144 * 32) }, Materials.Carbon.getNanite(2), 50 * 20, (int) GT_Values.VP[8]); /* - * General Rules for making nanite recipes: - * 1. Never make a nanite that takes a long time to make and only gives 1, just to be consumed. - * 2. Nanites meant to be consumed should either have a short duration or a big output. - * 3. Nanites which aren't consumed should have a long duration and output less than 16. - * 4. Nanites should always take UUM as a fluid and a lot of power to make. + * General Rules for making nanite recipes: 1. Never make a nanite that takes a long time to make and only gives + * 1, just to be consumed. 2. Nanites meant to be consumed should either have a short duration or a big output. + * 3. Nanites which aren't consumed should have a long duration and output less than 16. 4. Nanites should + * always take UUM as a fluid and a lot of power to make. */ // Carbon Nanites - Used to make more Nano Forge Controllers GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { - aUVTierLens, - getModItem("bartworks", "bw.werkstoffblockscasingadvanced.01", 8, 31776), - ItemList.Circuit_Chip_SoC.get(64) - }, - new FluidStack[] {Materials.UUMatter.getFluid(200_000)}, - new ItemStack[] { - Materials.Carbon.getNanite(64), - }, + new ItemStack[] { aUVTierLens, getModItem("bartworks", "bw.werkstoffblockscasingadvanced.01", 8, 31776), + ItemList.Circuit_Chip_SoC.get(64) }, + new FluidStack[] { Materials.UUMatter.getFluid(200_000) }, + new ItemStack[] { Materials.Carbon.getNanite(64), }, null, null, 500 * 20, @@ -93,9 +78,9 @@ public class GT_NaniteChain { // Silver Nanites - Used in Tier 2 PCB Factory to improve board production GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] {aUEVTierLens, Materials.Silver.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16)}, - new FluidStack[] {Materials.UUMatter.getFluid(200000)}, - new ItemStack[] {Materials.Silver.getNanite(1)}, + new ItemStack[] { aUEVTierLens, Materials.Silver.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16) }, + new FluidStack[] { Materials.UUMatter.getFluid(200000) }, + new ItemStack[] { Materials.Silver.getNanite(1) }, null, null, 750 * 20, @@ -104,14 +89,10 @@ public class GT_NaniteChain { // Neutronium Nanites - Used to upgrade the Nano Forge to Tier 2 GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { - aUHVTierLens, - Materials.Neutronium.getBlocks(8), - ItemList.Circuit_Chip_SoC2.get(64), - ItemList.Circuit_Chip_SoC2.get(32) - }, - new FluidStack[] {Materials.UUMatter.getFluid(200000)}, - new ItemStack[] {Materials.Neutronium.getNanite(1)}, + new ItemStack[] { aUHVTierLens, Materials.Neutronium.getBlocks(8), ItemList.Circuit_Chip_SoC2.get(64), + ItemList.Circuit_Chip_SoC2.get(32) }, + new FluidStack[] { Materials.UUMatter.getFluid(200000) }, + new ItemStack[] { Materials.Neutronium.getNanite(1) }, null, null, 100 * 20, @@ -120,17 +101,16 @@ public class GT_NaniteChain { // Glowstone Nanites - Used in the optical circuit line GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { - aUEVTierLens, - getModItem( - MOD_ID_GTPP, - "blockCompressedObsidian", - 8, - 7), // Double compressed glowstone blocks (yes, it's not obsidian) - ItemList.Circuit_Chip_SoC2.get(64) - }, - new FluidStack[] {Materials.UUMatter.getFluid(50000)}, - new ItemStack[] {Materials.Glowstone.getNanite(64)}, + new ItemStack[] { aUEVTierLens, getModItem(MOD_ID_GTPP, "blockCompressedObsidian", 8, 7), // Double + // compressed + // glowstone + // blocks + // (yes, it's + // not + // obsidian) + ItemList.Circuit_Chip_SoC2.get(64) }, + new FluidStack[] { Materials.UUMatter.getFluid(50000) }, + new ItemStack[] { Materials.Glowstone.getNanite(64) }, null, null, 200 * 20, @@ -139,9 +119,9 @@ public class GT_NaniteChain { // Gold Nanites - Used in Tier 3 PCB Factory to improve board production GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] {aUMVTierLens, Materials.Gold.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16)}, - new FluidStack[] {Materials.UUMatter.getFluid(300000)}, - new ItemStack[] {Materials.Gold.getNanite(1)}, + new ItemStack[] { aUMVTierLens, Materials.Gold.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16) }, + new FluidStack[] { Materials.UUMatter.getFluid(300000) }, + new ItemStack[] { Materials.Gold.getNanite(1) }, null, null, 1_000 * 20, @@ -150,15 +130,11 @@ public class GT_NaniteChain { // Transcendent Metal Nanites - Used to upgrade the Nano Forge to Tier 3 GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { - aUIVTierLens, - Materials.TranscendentMetal.getBlocks(8), - ItemList.Circuit_Chip_SoC2.get(64), - ItemList.Circuit_Chip_SoC2.get(64), - ItemList.Circuit_Chip_SoC2.get(64) - }, - new FluidStack[] {Materials.UUMatter.getFluid(2000000)}, - new ItemStack[] {Materials.TranscendentMetal.getNanite(1)}, + new ItemStack[] { aUIVTierLens, Materials.TranscendentMetal.getBlocks(8), + ItemList.Circuit_Chip_SoC2.get(64), ItemList.Circuit_Chip_SoC2.get(64), + ItemList.Circuit_Chip_SoC2.get(64) }, + new FluidStack[] { Materials.UUMatter.getFluid(2000000) }, + new ItemStack[] { Materials.TranscendentMetal.getNanite(1) }, null, null, 750 * 20, @@ -167,24 +143,16 @@ public class GT_NaniteChain { // White Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { - aUMVTierLens, - getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto lens - getModItem( - MOD_ID_GTPP, - "MU-metaitem.01", - 0, - 32105), // Quantum Anomaly, couldn't find any better naming - Materials.WhiteDwarfMatter.getBlocks(8), - getModItem(MOD_ID_DC, "item.PicoWafer", 32), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + new ItemStack[] { aUMVTierLens, getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto + // lens + getModItem(MOD_ID_GTPP, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any + // better naming + Materials.WhiteDwarfMatter.getBlocks(8), getModItem(MOD_ID_DC, "item.PicoWafer", 32), + getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit }, - new FluidStack[] { - Materials.UUMatter.getFluid(500_000), - Materials.RawStarMatter.getFluid(50_000), - FluidRegistry.getFluidStack("space", 720), - }, - new ItemStack[] {Materials.WhiteDwarfMatter.getNanite(4)}, + new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), + FluidRegistry.getFluidStack("space", 720), }, + new ItemStack[] { Materials.WhiteDwarfMatter.getNanite(4) }, null, null, 750 * 20, @@ -193,24 +161,16 @@ public class GT_NaniteChain { // Black Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { - aUMVTierLens, - getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto lens - getModItem( - MOD_ID_GTPP, - "MU-metaitem.01", - 0, - 32105), // Quantum Anomaly, couldn't find any better naming - Materials.BlackDwarfMatter.getBlocks(8), - getModItem(MOD_ID_DC, "item.PicoWafer", 32), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit - }, - new FluidStack[] { - Materials.UUMatter.getFluid(500_000), - Materials.RawStarMatter.getFluid(50_000), - FluidRegistry.getFluidStack("time", 720), + new ItemStack[] { aUMVTierLens, getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto + // lens + getModItem(MOD_ID_GTPP, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any + // better naming + Materials.BlackDwarfMatter.getBlocks(8), getModItem(MOD_ID_DC, "item.PicoWafer", 32), + getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit }, - new ItemStack[] {Materials.BlackDwarfMatter.getNanite(4)}, + new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), + FluidRegistry.getFluidStack("time", 720), }, + new ItemStack[] { Materials.BlackDwarfMatter.getNanite(4) }, null, null, 750 * 20, 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 6f258610b1..38406215ec 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -2,6 +2,14 @@ package gregtech.loaders.postload.chains; import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -11,12 +19,6 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_PCBFactoryManager; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; @SuppressWarnings("SpellCheckingInspection") public class GT_PCBFactoryRecipes { @@ -35,49 +37,38 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addAssemblylineRecipe( ItemList.Circuit_Board_Wetware.get(1), 3600, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 32), - ItemList.Machine_ZPM_CircuitAssembler.get(4), - new Object[] {OrePrefixes.circuit.get(Materials.Master), 16}, - ItemList.Robot_Arm_ZPM.get(8) - }, - new FluidStack[] {new FluidStack(solderLuV, 144 * 36), Materials.Naquadah.getMolten(144 * 18)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 32), + ItemList.Machine_ZPM_CircuitAssembler.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 16 }, ItemList.Robot_Arm_ZPM.get(8) }, + new FluidStack[] { new FluidStack(solderLuV, 144 * 36), Materials.Naquadah.getMolten(144 * 18) }, ItemList.PCBFactory.get(1), 6000 * 20, (int) GT_Values.VP[8]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), - Materials.get("Artherium-Sn").getPlates(6) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), + Materials.get("Artherium-Sn").getPlates(6) }, null, ItemList.BasicPhotolithographicFrameworkCasing.get(1), 30 * 20, (int) GT_Values.VP[7]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - Materials.EnrichedHolmium.getPlates(6) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + Materials.EnrichedHolmium.getPlates(6) }, null, ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1), 30 * 20, (int) GT_Values.VP[9]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_ModHandler.getModItem(MOD_ID_GTPP, "blockFrameGtCelestialTungsten", 1), - Materials.get("Quantum").getPlates(6) - }, + new ItemStack[] { GT_ModHandler.getModItem(MOD_ID_GTPP, "blockFrameGtCelestialTungsten", 1), + Materials.get("Quantum").getPlates(6) }, null, ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1), 30 * 20, (int) GT_Values.VP[11]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_ModHandler.getModItem(MOD_ID_GTPP, "blockFrameGtHypogen", 1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), - Materials.Thulium.getPlates(6) - }, + new ItemStack[] { GT_ModHandler.getModItem(MOD_ID_GTPP, "blockFrameGtHypogen", 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), + Materials.Thulium.getPlates(6) }, Materials.SpaceTime.getMolten(144 * 8), ItemList.InfinityCooledCasing.get(1), 10 * 20, @@ -95,17 +86,14 @@ public class GT_PCBFactoryRecipes { } aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { - 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)))) - }, + new ItemStack[] { 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, @@ -120,18 +108,15 @@ public class GT_PCBFactoryRecipes { } 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_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)))) - }, + new ItemStack[] { 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, @@ -146,18 +131,15 @@ public class GT_PCBFactoryRecipes { } 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_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)))) - }, + new ItemStack[] { 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, @@ -174,17 +156,14 @@ public class GT_PCBFactoryRecipes { } aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { - 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)))) - }, + new ItemStack[] { 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, @@ -199,18 +178,15 @@ public class GT_PCBFactoryRecipes { } 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_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)))) - }, + new ItemStack[] { 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, @@ -225,18 +201,15 @@ public class GT_PCBFactoryRecipes { } 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_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)))) - }, + new ItemStack[] { 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, @@ -253,18 +226,16 @@ public class GT_PCBFactoryRecipes { } aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { - 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)))) - }, + new ItemStack[] { 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, @@ -279,19 +250,17 @@ public class GT_PCBFactoryRecipes { } 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_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)))) - }, + new ItemStack[] { 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, @@ -306,19 +275,17 @@ public class GT_PCBFactoryRecipes { } 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_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)))) - }, + new ItemStack[] { 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, @@ -335,18 +302,14 @@ public class GT_PCBFactoryRecipes { } aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { - 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)))) - }, + new ItemStack[] { 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, @@ -361,19 +324,15 @@ public class GT_PCBFactoryRecipes { } 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_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)))) - }, + new ItemStack[] { 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, @@ -388,19 +347,15 @@ public class GT_PCBFactoryRecipes { } 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_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)))) - }, + new ItemStack[] { 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, @@ -417,19 +372,19 @@ public class GT_PCBFactoryRecipes { } aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { - 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)))), - Materials.IronIIIChloride.getFluid((long) (5000 * (Math.sqrt(tier - 4)))), - Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))) - }, + new ItemStack[] { 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)))), + 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, @@ -444,20 +399,20 @@ public class GT_PCBFactoryRecipes { } 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_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)))), - Materials.IronIIIChloride.getFluid((long) (5000 * (Math.sqrt(tier - 4)))), - Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))) - }, + new ItemStack[] { 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)))), + 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, @@ -472,20 +427,20 @@ public class GT_PCBFactoryRecipes { } 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_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)))), - Materials.IronIIIChloride.getFluid((long) (5000 * (Math.sqrt(tier - 4)))), - Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))) - }, + new ItemStack[] { 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)))), + 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, @@ -502,19 +457,17 @@ public class GT_PCBFactoryRecipes { } aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator.get(OrePrefixes.foil, 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)))), - Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))), - Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + 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)))), + 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, @@ -529,20 +482,18 @@ public class GT_PCBFactoryRecipes { } 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_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator.get(OrePrefixes.foil, 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)))), - Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))), - Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2), + GT_Utility.getNaniteAsCatalyst(Materials.Silver), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + 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)))), + 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, @@ -557,20 +508,18 @@ public class GT_PCBFactoryRecipes { } 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_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator.get(OrePrefixes.foil, 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)))), - Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))), - Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(3), + GT_Utility.getNaniteAsCatalyst(Materials.Gold), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + 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)))), + 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, @@ -588,22 +537,24 @@ public class GT_PCBFactoryRecipes { } aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) - .getPlates(1), - GT_ModHandler.getModItem( - "bartworks", "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), - 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)))), - Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_ModHandler.getModItem( + "bartworks", + "gt.bwMetaGeneratedfoil", + (long) (16 * (Math.sqrt(tier - 6))), + 10106), + 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)))), + 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, @@ -618,23 +569,25 @@ public class GT_PCBFactoryRecipes { } aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(2), - GT_Utility.getNaniteAsCatalyst(Materials.Silver), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) - .getPlates(1), - GT_ModHandler.getModItem( - "bartworks", "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), - 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)))), - Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2), + GT_Utility.getNaniteAsCatalyst(Materials.Silver), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_ModHandler.getModItem( + "bartworks", + "gt.bwMetaGeneratedfoil", + (long) (16 * (Math.sqrt(tier - 6))), + 10106), + 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)))), + 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, @@ -649,23 +602,25 @@ public class GT_PCBFactoryRecipes { } aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(3), - GT_Utility.getNaniteAsCatalyst(Materials.Gold), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) - .getPlates(1), - GT_ModHandler.getModItem( - "bartworks", "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), - 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)))), - Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(3), + GT_Utility.getNaniteAsCatalyst(Materials.Gold), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_ModHandler.getModItem( + "bartworks", + "gt.bwMetaGeneratedfoil", + (long) (16 * (Math.sqrt(tier - 6))), + 10106), + 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)))), + 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, diff --git a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java index f69eb6d752..d64825965d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java @@ -1,5 +1,7 @@ package gregtech.loaders.postload.recipes; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -7,111 +9,50 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; public class AlloySmelterRecipes implements Runnable { + private final MaterialStack[][] mAlloySmelterList = { - { - new MaterialStack(Materials.Tetrahedrite, 3L), - new MaterialStack(Materials.Tin, 1L), - new MaterialStack(Materials.Bronze, 3L) - }, - { - new MaterialStack(Materials.Tetrahedrite, 3L), - new MaterialStack(Materials.Zinc, 1L), - new MaterialStack(Materials.Brass, 3L) - }, - { - new MaterialStack(Materials.Copper, 3L), - new MaterialStack(Materials.Tin, 1L), - new MaterialStack(Materials.Bronze, 4L) - }, - { - new MaterialStack(Materials.Copper, 3L), - new MaterialStack(Materials.Zinc, 1L), - new MaterialStack(Materials.Brass, 4L) - }, - { - new MaterialStack(Materials.Copper, 1L), - new MaterialStack(Materials.Nickel, 1L), - new MaterialStack(Materials.Cupronickel, 2L) - }, - { - new MaterialStack(Materials.Copper, 1L), - new MaterialStack(Materials.Redstone, 4L), - new MaterialStack(Materials.RedAlloy, 1L) - }, - { - new MaterialStack(Materials.AnnealedCopper, 3L), - new MaterialStack(Materials.Tin, 1L), - new MaterialStack(Materials.Bronze, 4L) - }, - { - new MaterialStack(Materials.AnnealedCopper, 3L), - new MaterialStack(Materials.Zinc, 1L), - new MaterialStack(Materials.Brass, 4L) - }, - { - new MaterialStack(Materials.AnnealedCopper, 1L), - new MaterialStack(Materials.Nickel, 1L), - new MaterialStack(Materials.Cupronickel, 2L) - }, - { - new MaterialStack(Materials.AnnealedCopper, 1L), - new MaterialStack(Materials.Redstone, 4L), - new MaterialStack(Materials.RedAlloy, 1L) - }, - { - new MaterialStack(Materials.Iron, 1L), - new MaterialStack(Materials.Tin, 1L), - new MaterialStack(Materials.TinAlloy, 2L) - }, - { - new MaterialStack(Materials.WroughtIron, 1L), - new MaterialStack(Materials.Tin, 1L), - new MaterialStack(Materials.TinAlloy, 2L) - }, - { - new MaterialStack(Materials.Iron, 2L), - new MaterialStack(Materials.Nickel, 1L), - new MaterialStack(Materials.Invar, 3L) - }, - { - new MaterialStack(Materials.WroughtIron, 2L), - new MaterialStack(Materials.Nickel, 1L), - new MaterialStack(Materials.Invar, 3L) - }, - { - new MaterialStack(Materials.Tin, 9L), - new MaterialStack(Materials.Antimony, 1L), - new MaterialStack(Materials.SolderingAlloy, 10L) - }, - { - new MaterialStack(Materials.Lead, 4L), - new MaterialStack(Materials.Antimony, 1L), - new MaterialStack(Materials.BatteryAlloy, 5L) - }, - { - new MaterialStack(Materials.Gold, 1L), - new MaterialStack(Materials.Silver, 1L), - new MaterialStack(Materials.Electrum, 2L) - }, - { - new MaterialStack(Materials.Magnesium, 1L), - new MaterialStack(Materials.Aluminium, 2L), - new MaterialStack(Materials.Magnalium, 3L) - }, - { - new MaterialStack(Materials.Silver, 1L), - new MaterialStack(Materials.Electrotine, 4L), - new MaterialStack(Materials.BlueAlloy, 1L) - }, - { - new MaterialStack(Materials.Boron, 1L), - new MaterialStack(Materials.Glass, 7L), - new MaterialStack(Materials.BorosilicateGlass, 8L) - } - }; + { new MaterialStack(Materials.Tetrahedrite, 3L), new MaterialStack(Materials.Tin, 1L), + new MaterialStack(Materials.Bronze, 3L) }, + { new MaterialStack(Materials.Tetrahedrite, 3L), new MaterialStack(Materials.Zinc, 1L), + new MaterialStack(Materials.Brass, 3L) }, + { new MaterialStack(Materials.Copper, 3L), new MaterialStack(Materials.Tin, 1L), + new MaterialStack(Materials.Bronze, 4L) }, + { new MaterialStack(Materials.Copper, 3L), new MaterialStack(Materials.Zinc, 1L), + new MaterialStack(Materials.Brass, 4L) }, + { new MaterialStack(Materials.Copper, 1L), new MaterialStack(Materials.Nickel, 1L), + new MaterialStack(Materials.Cupronickel, 2L) }, + { new MaterialStack(Materials.Copper, 1L), new MaterialStack(Materials.Redstone, 4L), + new MaterialStack(Materials.RedAlloy, 1L) }, + { new MaterialStack(Materials.AnnealedCopper, 3L), new MaterialStack(Materials.Tin, 1L), + new MaterialStack(Materials.Bronze, 4L) }, + { new MaterialStack(Materials.AnnealedCopper, 3L), new MaterialStack(Materials.Zinc, 1L), + new MaterialStack(Materials.Brass, 4L) }, + { new MaterialStack(Materials.AnnealedCopper, 1L), new MaterialStack(Materials.Nickel, 1L), + new MaterialStack(Materials.Cupronickel, 2L) }, + { new MaterialStack(Materials.AnnealedCopper, 1L), new MaterialStack(Materials.Redstone, 4L), + new MaterialStack(Materials.RedAlloy, 1L) }, + { new MaterialStack(Materials.Iron, 1L), new MaterialStack(Materials.Tin, 1L), + new MaterialStack(Materials.TinAlloy, 2L) }, + { new MaterialStack(Materials.WroughtIron, 1L), new MaterialStack(Materials.Tin, 1L), + new MaterialStack(Materials.TinAlloy, 2L) }, + { new MaterialStack(Materials.Iron, 2L), new MaterialStack(Materials.Nickel, 1L), + new MaterialStack(Materials.Invar, 3L) }, + { new MaterialStack(Materials.WroughtIron, 2L), new MaterialStack(Materials.Nickel, 1L), + new MaterialStack(Materials.Invar, 3L) }, + { new MaterialStack(Materials.Tin, 9L), new MaterialStack(Materials.Antimony, 1L), + new MaterialStack(Materials.SolderingAlloy, 10L) }, + { new MaterialStack(Materials.Lead, 4L), new MaterialStack(Materials.Antimony, 1L), + new MaterialStack(Materials.BatteryAlloy, 5L) }, + { new MaterialStack(Materials.Gold, 1L), new MaterialStack(Materials.Silver, 1L), + new MaterialStack(Materials.Electrum, 2L) }, + { new MaterialStack(Materials.Magnesium, 1L), new MaterialStack(Materials.Aluminium, 2L), + new MaterialStack(Materials.Magnalium, 3L) }, + { new MaterialStack(Materials.Silver, 1L), new MaterialStack(Materials.Electrotine, 4L), + new MaterialStack(Materials.BlueAlloy, 1L) }, + { new MaterialStack(Materials.Boron, 1L), new MaterialStack(Materials.Glass, 7L), + new MaterialStack(Materials.BorosilicateGlass, 8L) } }; @Override public void run() { @@ -122,14 +63,14 @@ public class AlloySmelterRecipes implements Runnable { ItemStack tIngot2 = GT_OreDictUnificator.get(OrePrefixes.ingot, tMats[1].mMaterial, tMats[1].mAmount); ItemStack tOutputIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, tMats[2].mMaterial, tMats[2].mAmount); if (tOutputIngot != GT_Values.NI) { - GT_ModHandler.addAlloySmelterRecipe( - tIngot1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); - GT_ModHandler.addAlloySmelterRecipe( - tIngot1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); - GT_ModHandler.addAlloySmelterRecipe( - tDust1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); - GT_ModHandler.addAlloySmelterRecipe( - tDust1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); + GT_ModHandler + .addAlloySmelterRecipe(tIngot1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); + GT_ModHandler + .addAlloySmelterRecipe(tIngot1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); + GT_ModHandler + .addAlloySmelterRecipe(tDust1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); + GT_ModHandler + .addAlloySmelterRecipe(tDust1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java index a6a61c9470..632fe5d385 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java @@ -3,411 +3,347 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.GT_Values.MOD_ID_RC; import static gregtech.api.util.GT_ModHandler.getModItem; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; public class ArcFurnaceRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addArcFurnaceRecipe( ItemList.Block_TungstenSteelReinforced.get(1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1) }, null, 160, 96); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Fluid.get(1L), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L) }, null, 180, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Item.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 12L), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 12L), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L) }, null, 180, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1L), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L) }, null, 10, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Item_Pipe.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L) }, null, 10, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Cupronickel.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Kanthal.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Nichrome.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_TungstenSteel.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_HSSG.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_HSSS.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Naquadah.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_NaquadahAlloy.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Trinium.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_ElectrumFlux.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_AwakenedDraconium.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 0), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L) }, null, 150, 90); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) }, null, 150, 90); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 2), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6) }, null, 150, 90); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 13), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L) }, null, 180, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 14), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) }, null, 180, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 15), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 6L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 6L) }, null, 180, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 2L) }, null, 210, 150); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 1), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3) }, null, 210, 150); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 6L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 6L) }, null, 210, 150); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L) }, null, 240, 180); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 4), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) }, null, 240, 180); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.StainlessSteel, 6L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.StainlessSteel, 6L) }, null, 240, 180); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 2L) }, null, 270, 210); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 7), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) }, null, 270, 210); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Titanium, 6L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Titanium, 6L) }, null, 270, 210); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2L) }, null, 300, 240); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 10), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) }, null, 300, 240); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.TungstenSteel, 6L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.TungstenSteel, 6L) }, null, 300, 240); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 2L) }, null, 330, 270); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 13), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) }, null, 330, 270); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NiobiumTitanium, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NiobiumTitanium, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L) }, null, 330, 270); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 0), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 2L) }, null, 360, 300); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) }, null, 360, 300); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 2), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Enderium, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Enderium, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L) }, null, 360, 300); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 3), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 2L) }, null, 360, 330); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 4), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) }, null, 360, 330); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 5), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L) }, null, 360, 330); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 6), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 2L) }, null, 360, 360); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 7), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3) }, null, 360, 360); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 8), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neutronium, 6L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neutronium, 6L) }, null, 360, 360); @@ -415,7 +351,7 @@ public class ArcFurnaceRecipes implements Runnable { GT_Values.RA.addSimpleArcFurnaceRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1L), Materials.Oxygen.getGas(2000L), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3) }, null, 1200, (int) TierEU.RECIPE_LV); diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 33d0544713..5d9891cf95 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -5,6 +5,13 @@ import static gregtech.api.enums.GT_Values.MOD_ID_RC; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.*; @@ -12,14 +19,9 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class AssemblerRecipes implements Runnable { + @Override public void run() { @@ -72,484 +74,360 @@ public class AssemblerRecipes implements Runnable { 20, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_ModHandler.getIC2Item("carbonMesh", 4L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_ModHandler.getIC2Item("carbonMesh", 4L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.Component_Filter.get(1L), 1600, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16L), + GT_Utility.getIntegratedCircuit(1) }, Materials.Plastic.getFluid(144), ItemList.Component_Filter.get(1), 1600, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), - ItemList.Circuit_Silicon_Wafer2.get(32L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), + ItemList.Circuit_Silicon_Wafer2.get(32L), GT_Utility.getIntegratedCircuit(1) }, Materials.AdvancedGlue.getFluid(500L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64), 3200, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), - ItemList.Circuit_Silicon_Wafer3.get(8L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), + ItemList.Circuit_Silicon_Wafer3.get(8L), GT_Utility.getIntegratedCircuit(1) }, Materials.AdvancedGlue.getFluid(250L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64), 800, 7920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_LV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 2L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Electric_Pump_LV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 2L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.FluidRegulator_LV.get(1L), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Electric_Pump_MV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.FluidRegulator_MV.get(1L), 350, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 2L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Electric_Pump_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 2L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.FluidRegulator_HV.get(1L), 300, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 2L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Electric_Pump_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 2L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.FluidRegulator_EV.get(1L), 250, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_IV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Elite), 2L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Electric_Pump_IV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Elite), 2L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.FluidRegulator_IV.get(1L), 200, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_LuV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Master), 2L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Electric_Pump_LuV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Master), 2L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.FluidRegulator_LuV.get(1L), 150, (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_ZPM.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Ultimate), 2L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Electric_Pump_ZPM.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Ultimate), 2L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.FluidRegulator_ZPM.get(1L), 100, (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_UV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Electric_Pump_UV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.FluidRegulator_UV.get(1L), 50, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_LV.get(1L), - ItemList.Electric_Motor_LV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Steel), 2L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Electric_Pump_LV.get(1L), ItemList.Electric_Motor_LV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Steel), 2L), + GT_Utility.getIntegratedCircuit(5) }, GT_Values.NF, ItemList.Steam_Valve_LV.get(1L), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_MV.get(1L), - ItemList.Electric_Motor_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Aluminium), 2L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Electric_Pump_MV.get(1L), ItemList.Electric_Motor_MV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Aluminium), 2L), + GT_Utility.getIntegratedCircuit(5) }, GT_Values.NF, ItemList.Steam_Valve_MV.get(1L), 350, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_HV.get(1L), - ItemList.Electric_Motor_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.StainlessSteel), 2L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Electric_Pump_HV.get(1L), ItemList.Electric_Motor_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.StainlessSteel), 2L), + GT_Utility.getIntegratedCircuit(5) }, GT_Values.NF, ItemList.Steam_Valve_HV.get(1L), 300, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_EV.get(1L), - ItemList.Electric_Motor_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Titanium), 2L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Electric_Pump_EV.get(1L), ItemList.Electric_Motor_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Titanium), 2L), + GT_Utility.getIntegratedCircuit(5) }, GT_Values.NF, ItemList.Steam_Valve_EV.get(1L), 250, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_IV.get(1L), - ItemList.Electric_Motor_IV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.TungstenSteel), 2L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Electric_Pump_IV.get(1L), ItemList.Electric_Motor_IV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.TungstenSteel), 2L), + GT_Utility.getIntegratedCircuit(5) }, GT_Values.NF, ItemList.Steam_Valve_IV.get(1L), 200, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 4), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Schematic.get(1L), 600, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 3L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 3L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Schematic.get(1L), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 1), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 1), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Schematic.get(1L), 150, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L), - ItemList.Circuit_Chip_LPIC.get(2L), - ItemList.HV_Coil.get(2L), - ItemList.Reactor_Coolant_He_1.get(1L), - ItemList.Electric_Pump_HV.get(1L) - }, + new ItemStack[] { ItemList.Hull_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L), + ItemList.Circuit_Chip_LPIC.get(2L), ItemList.HV_Coil.get(2L), + ItemList.Reactor_Coolant_He_1.get(1L), ItemList.Electric_Pump_HV.get(1L) }, GT_Values.NF, ItemList.Hatch_Energy_HV.get(1L), 200, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1L), - ItemList.Circuit_Chip_PIC.get(2L), - ItemList.EV_Coil.get(2L), - ItemList.Reactor_Coolant_He_1.get(1L), - ItemList.Electric_Pump_EV.get(1L) - }, + new ItemStack[] { ItemList.Hull_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1L), + ItemList.Circuit_Chip_PIC.get(2L), ItemList.EV_Coil.get(2L), + ItemList.Reactor_Coolant_He_1.get(1L), ItemList.Electric_Pump_EV.get(1L) }, GT_Values.NF, ItemList.Hatch_Energy_EV.get(1L), 200, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1L), - ItemList.Circuit_Chip_HPIC.get(2L), - ItemList.IV_Coil.get(2L), - ItemList.Reactor_Coolant_He_3.get(1L), - ItemList.Electric_Pump_IV.get(1L) - }, + new ItemStack[] { ItemList.Hull_IV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1L), + ItemList.Circuit_Chip_HPIC.get(2L), ItemList.IV_Coil.get(2L), + ItemList.Reactor_Coolant_He_3.get(1L), ItemList.Electric_Pump_IV.get(1L) }, GT_Values.NF, ItemList.Hatch_Energy_IV.get(1L), 200, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L), - ItemList.Circuit_Chip_LPIC.get(2L), - ItemList.HV_Coil.get(2L), - ItemList.Reactor_Coolant_NaK_1.get(1L), - ItemList.Electric_Pump_HV.get(1L) - }, + new ItemStack[] { ItemList.Hull_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L), + ItemList.Circuit_Chip_LPIC.get(2L), ItemList.HV_Coil.get(2L), + ItemList.Reactor_Coolant_NaK_1.get(1L), ItemList.Electric_Pump_HV.get(1L) }, GT_Values.NF, ItemList.Hatch_Energy_HV.get(1L), 200, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1L), - ItemList.Circuit_Chip_PIC.get(2L), - ItemList.EV_Coil.get(2L), - ItemList.Reactor_Coolant_NaK_1.get(1L), - ItemList.Electric_Pump_EV.get(1L) - }, + new ItemStack[] { ItemList.Hull_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1L), + ItemList.Circuit_Chip_PIC.get(2L), ItemList.EV_Coil.get(2L), + ItemList.Reactor_Coolant_NaK_1.get(1L), ItemList.Electric_Pump_EV.get(1L) }, GT_Values.NF, ItemList.Hatch_Energy_EV.get(1L), 200, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1L), - ItemList.Circuit_Chip_HPIC.get(2L), - ItemList.IV_Coil.get(2L), - ItemList.Reactor_Coolant_NaK_3.get(1L), - ItemList.Electric_Pump_IV.get(1L) - }, + new ItemStack[] { ItemList.Hull_IV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1L), + ItemList.Circuit_Chip_HPIC.get(2L), ItemList.IV_Coil.get(2L), + ItemList.Reactor_Coolant_NaK_3.get(1L), ItemList.Electric_Pump_IV.get(1L) }, GT_Values.NF, ItemList.Hatch_Energy_IV.get(1L), 200, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Gold, 1L), - ItemList.Circuit_Chip_LPIC.get(2L), - ItemList.HV_Coil.get(2L), - ItemList.Reactor_Coolant_He_1.get(1L), - ItemList.Electric_Pump_HV.get(1L) - }, + new ItemStack[] { ItemList.Hull_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Gold, 1L), + ItemList.Circuit_Chip_LPIC.get(2L), ItemList.HV_Coil.get(2L), + ItemList.Reactor_Coolant_He_1.get(1L), ItemList.Electric_Pump_HV.get(1L) }, GT_Values.NF, ItemList.Hatch_Dynamo_HV.get(1L), 200, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Aluminium, 1L), - ItemList.Circuit_Chip_PIC.get(2L), - ItemList.EV_Coil.get(2L), - ItemList.Reactor_Coolant_He_1.get(1L), - ItemList.Electric_Pump_EV.get(1L) - }, + new ItemStack[] { ItemList.Hull_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Aluminium, 1L), + ItemList.Circuit_Chip_PIC.get(2L), ItemList.EV_Coil.get(2L), + ItemList.Reactor_Coolant_He_1.get(1L), ItemList.Electric_Pump_EV.get(1L) }, GT_Values.NF, ItemList.Hatch_Dynamo_EV.get(1L), 200, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Vanadiumtriindinid, 1L), - ItemList.Circuit_Chip_HPIC.get(2L), - ItemList.IV_Coil.get(2L), - ItemList.Reactor_Coolant_He_3.get(1L), - ItemList.Electric_Pump_IV.get(1L) - }, + new ItemStack[] { ItemList.Hull_IV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Vanadiumtriindinid, 1L), + ItemList.Circuit_Chip_HPIC.get(2L), ItemList.IV_Coil.get(2L), + ItemList.Reactor_Coolant_He_3.get(1L), ItemList.Electric_Pump_IV.get(1L) }, GT_Values.NF, ItemList.Hatch_Dynamo_IV.get(1L), 200, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Gold, 1L), - ItemList.Circuit_Chip_LPIC.get(2L), - ItemList.HV_Coil.get(2L), - ItemList.Reactor_Coolant_NaK_1.get(1L), - ItemList.Electric_Pump_HV.get(1L) - }, + new ItemStack[] { ItemList.Hull_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Gold, 1L), + ItemList.Circuit_Chip_LPIC.get(2L), ItemList.HV_Coil.get(2L), + ItemList.Reactor_Coolant_NaK_1.get(1L), ItemList.Electric_Pump_HV.get(1L) }, GT_Values.NF, ItemList.Hatch_Dynamo_HV.get(1L), 200, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Aluminium, 1L), - ItemList.Circuit_Chip_PIC.get(2L), - ItemList.EV_Coil.get(2L), - ItemList.Reactor_Coolant_NaK_1.get(1L), - ItemList.Electric_Pump_EV.get(1L) - }, + new ItemStack[] { ItemList.Hull_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Aluminium, 1L), + ItemList.Circuit_Chip_PIC.get(2L), ItemList.EV_Coil.get(2L), + ItemList.Reactor_Coolant_NaK_1.get(1L), ItemList.Electric_Pump_EV.get(1L) }, GT_Values.NF, ItemList.Hatch_Dynamo_EV.get(1L), 200, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Vanadiumtriindinid, 1L), - ItemList.Circuit_Chip_HPIC.get(2L), - ItemList.IV_Coil.get(2L), - ItemList.Reactor_Coolant_NaK_3.get(1L), - ItemList.Electric_Pump_IV.get(1L) - }, + new ItemStack[] { ItemList.Hull_IV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Vanadiumtriindinid, 1L), + ItemList.Circuit_Chip_HPIC.get(2L), ItemList.IV_Coil.get(2L), + ItemList.Reactor_Coolant_NaK_3.get(1L), ItemList.Electric_Pump_IV.get(1L) }, GT_Values.NF, ItemList.Hatch_Dynamo_IV.get(1L), 200, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Steel, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 2L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Steel, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 2L), + GT_Utility.getIntegratedCircuit(2) }, Materials.Tin.getMolten(144L), ItemList.Long_Distance_Pipeline_Fluid.get(2L), 300, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Tin, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 2L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Tin, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 2L), + GT_Utility.getIntegratedCircuit(2) }, Materials.Tin.getMolten(144L), ItemList.Long_Distance_Pipeline_Item.get(2L), 300, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 9L), - GT_Utility.getIntegratedCircuit(24) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 9L), + GT_Utility.getIntegratedCircuit(24) }, Materials.Tin.getMolten(144L), ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(64L), 600, 24); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Tin, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 9L), - GT_Utility.getIntegratedCircuit(24) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Tin, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 9L), + GT_Utility.getIntegratedCircuit(24) }, Materials.Tin.getMolten(144L), ItemList.Long_Distance_Pipeline_Item_Pipe.get(64L), 600, 24); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.StainlessSteel, 1L), - ItemList.Hull_EV.get(1L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.StainlessSteel, 1L), + ItemList.Hull_EV.get(1L), GT_Utility.getIntegratedCircuit(4) }, Materials.Glass.getMolten(2304L), ItemList.Hatch_Input_Multi_2x2_EV.get(1L), 600, 24); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.Titanium, 1L), - ItemList.Hull_IV.get(1L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.Titanium, 1L), + ItemList.Hull_IV.get(1L), GT_Utility.getIntegratedCircuit(4) }, Materials.Glass.getMolten(2304L), ItemList.Hatch_Input_Multi_2x2_IV.get(1L), 600, 24); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.TungstenSteel, 1L), - ItemList.Hull_LuV.get(1L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.TungstenSteel, 1L), + ItemList.Hull_LuV.get(1L), GT_Utility.getIntegratedCircuit(4) }, Materials.Polytetrafluoroethylene.getMolten(2304L), ItemList.Hatch_Input_Multi_2x2_LuV.get(1L), 600, 24); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.NiobiumTitanium, 1L), - ItemList.Hull_ZPM.get(1L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.NiobiumTitanium, 1L), + ItemList.Hull_ZPM.get(1L), GT_Utility.getIntegratedCircuit(4) }, Materials.Polytetrafluoroethylene.getMolten(2304L), ItemList.Hatch_Input_Multi_2x2_ZPM.get(1L), 600, 24); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.MysteriousCrystal, 1L), - ItemList.Hull_UV.get(1L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.MysteriousCrystal, 1L), + ItemList.Hull_UV.get(1L), GT_Utility.getIntegratedCircuit(4) }, Materials.Polybenzimidazole.getMolten(2304L), ItemList.Hatch_Input_Multi_2x2_UV.get(1L), 600, 24); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.Neutronium, 1L), - ItemList.Hull_MAX.get(1L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.Neutronium, 1L), + ItemList.Hull_MAX.get(1L), GT_Utility.getIntegratedCircuit(4) }, Materials.Polybenzimidazole.getMolten(2304L), ItemList.Hatch_Input_Multi_2x2_UHV.get(1L), 600, 24); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L), - ItemList.Robot_Arm_IV.get(2L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L), + ItemList.Robot_Arm_IV.get(2L), GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Casing_Gearbox_TungstenSteel.get(1L), 200, @@ -561,165 +439,178 @@ public class AssemblerRecipes implements Runnable { nbtFlask.setInteger("Capacity", 144); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(1), flask, 10, (int) - TierEU.RECIPE_LV); + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(1), + flask, + 10, + (int) TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 288); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(2), flask, 10, (int) - TierEU.RECIPE_LV); + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(2), + flask, + 10, + (int) TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 576); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(3), flask, 10, (int) - TierEU.RECIPE_LV); + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(3), + flask, + 10, + (int) TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 720); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(4), flask, 10, (int) - TierEU.RECIPE_LV); + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(4), + flask, + 10, + (int) TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 864); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(5), flask, 10, (int) - TierEU.RECIPE_LV); + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(5), + flask, + 10, + (int) TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 72); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(6), flask, 10, (int) - TierEU.RECIPE_LV); + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(6), + flask, + 10, + (int) TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 648); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(7), flask, 10, (int) - TierEU.RECIPE_LV); + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(7), + flask, + 10, + (int) TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 936); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(8), flask, 10, (int) - TierEU.RECIPE_LV); + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(8), + flask, + 10, + (int) TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 250); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(10), flask, 10, (int) - TierEU.RECIPE_LV); + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(10), + flask, + 10, + (int) TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 500); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(11), flask, 10, (int) - TierEU.RECIPE_LV); + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(11), + flask, + 10, + (int) TierEU.RECIPE_LV); // make the 1000L recipe actually in ItemStack flask500 = flask.copy(); nbtFlask.setInteger("Capacity", 1000); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - flask500, GT_Utility.getIntegratedCircuit(24), flask, 10, (int) TierEU.RECIPE_LV); + flask500, + GT_Utility.getIntegratedCircuit(24), + flask, + 10, + (int) TierEU.RECIPE_LV); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Bronze, 1L), - ItemList.Electric_Motor_LV.get(1L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_LV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Bronze, 1L), + ItemList.Electric_Motor_LV.get(1L), GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Hatch_Muffler_LV.get(1L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1L), - ItemList.Electric_Motor_MV.get(1L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_MV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1L), + ItemList.Electric_Motor_MV.get(1L), GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Hatch_Muffler_MV.get(1L), 200, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L), - ItemList.Electric_Motor_HV.get(1L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L), + ItemList.Electric_Motor_HV.get(1L), GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Hatch_Muffler_HV.get(1L), 200, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 1L), - ItemList.Electric_Motor_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 1L), + ItemList.Electric_Motor_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Hatch_Muffler_EV.get(1L), 200, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1L), - ItemList.Electric_Motor_IV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_IV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1L), + ItemList.Electric_Motor_IV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Hatch_Muffler_IV.get(1L), 200, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 1L), - ItemList.Electric_Motor_LuV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Enderium, 1L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 1L), + ItemList.Electric_Motor_LuV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Enderium, 1L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Hatch_Muffler_LuV.get(1L), 200, (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1L), - ItemList.Electric_Motor_ZPM.get(1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 1L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1L), + ItemList.Electric_Motor_ZPM.get(1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 1L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Hatch_Muffler_ZPM.get(1L), 200, (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 1L), - ItemList.Electric_Motor_UV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 1L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_UV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 1L), + ItemList.Electric_Motor_UV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 1L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Hatch_Muffler_UV.get(1L), 200, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.MysteriousCrystal, 1L), - ItemList.Electric_Motor_UHV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 1L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.MysteriousCrystal, 1L), + ItemList.Electric_Motor_UHV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 1L), + GT_Utility.getIntegratedCircuit(3) }, GT_Values.NF, ItemList.Hatch_Muffler_MAX.get(1L), 200, @@ -922,31 +813,22 @@ public class AssemblerRecipes implements Runnable { 100, 4); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 3L), - GT_ModHandler.getIC2Item("carbonMesh", 3L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 3L), + GT_ModHandler.getIC2Item("carbonMesh", 3L), GT_Utility.getIntegratedCircuit(1) }, Materials.Glue.getFluid(300L), ItemList.Duct_Tape.get(1L), 100, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 2L), - GT_ModHandler.getIC2Item("carbonMesh", 2L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 2L), + GT_ModHandler.getIC2Item("carbonMesh", 2L), GT_Utility.getIntegratedCircuit(2) }, Materials.Glue.getFluid(200L), ItemList.Duct_Tape.get(1L), 100, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1L), - GT_ModHandler.getIC2Item("carbonMesh", 1L), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1L), + GT_ModHandler.getIC2Item("carbonMesh", 1L), GT_Utility.getIntegratedCircuit(3) }, Materials.Glue.getFluid(100L), ItemList.Duct_Tape.get(1L), 100, @@ -954,8 +836,8 @@ public class AssemblerRecipes implements Runnable { // Maintenance Hatch Recipes Using BrainTech + Refined Glue. Info: One BrainTech Recipe Is In GT+ü Originally. // The Maintenance Hatch Recipe using SuperGlue is there. GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(2), GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(2), + GT_Utility.getIntegratedCircuit(2) }, Materials.Glue.getFluid(1000L), ItemList.Hatch_Maintenance.get(1L), 100, @@ -996,7 +878,7 @@ public class AssemblerRecipes implements Runnable { 32, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 4L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 4L) }, GT_Values.NF, ItemList.Cell_Universal_Fluid.get(1L), 128, @@ -1108,245 +990,205 @@ public class AssemblerRecipes implements Runnable { 4); // SC craft + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2L), + ItemList.Electric_Pump_MV.get(1L), GT_Utility.getIntegratedCircuit(9) }, + Materials.Helium.getGas(2000L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3L), + 400, + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2L), - ItemList.Electric_Pump_MV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, - Materials.Helium.getGas(2000L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3L), - 400, - (int) TierEU.RECIPE_MV); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4L), - ItemList.Electric_Pump_HV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4L), + ItemList.Electric_Pump_HV.get(1L), GT_Utility.getIntegratedCircuit(9) }, Materials.Helium.getGas(4000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6L), 400, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6L), - ItemList.Electric_Pump_EV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6L), + ItemList.Electric_Pump_EV.get(1L), GT_Utility.getIntegratedCircuit(9) }, Materials.Helium.getGas(6000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9L), 400, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8L), - ItemList.Electric_Pump_IV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8L), + ItemList.Electric_Pump_IV.get(1L), GT_Utility.getIntegratedCircuit(9) }, Materials.Helium.getGas(8000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12L), 800, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, - Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, - 15L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10L), - ItemList.Electric_Pump_LuV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, + 15L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10L), + ItemList.Electric_Pump_LuV.get(1L), GT_Utility.getIntegratedCircuit(9) }, Materials.Helium.getGas(12000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15L), 800, (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12L), - ItemList.Electric_Pump_ZPM.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12L), + ItemList.Electric_Pump_ZPM.get(1L), GT_Utility.getIntegratedCircuit(9) }, Materials.Helium.getGas(16000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18L), 1600, (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14L), - ItemList.Electric_Pump_UV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14L), + ItemList.Electric_Pump_UV.get(1L), GT_Utility.getIntegratedCircuit(9) }, Materials.Helium.getGas(20000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21L), 1600, (int) TierEU.RECIPE_UV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16L), - ItemList.Electric_Pump_UHV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16L), + ItemList.Electric_Pump_UHV.get(1L), GT_Utility.getIntegratedCircuit(9) }, Materials.Helium.getGas(24000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24L), 3200, (int) TierEU.RECIPE_UHV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lead, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lead, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.ULV_Coil.get(1L), 200, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.LV_Coil.get(1L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Aluminium, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Aluminium, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.MV_Coil.get(1L), 200, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.EnergeticAlloy, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.EnergeticAlloy, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.HV_Coil.get(1L), 200, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.TungstenSteel, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.TungstenSteel, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.EV_Coil.get(1L), 200, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iridium, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iridium, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.IV_Coil.get(1L), 200, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.LuV_Coil.get(1L), 200, (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.ZPM_Coil.get(1L), 200, (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.ElectrumFlux, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.ElectrumFlux, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.UV_Coil.get(1L), 200, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 16L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 16L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.UHV_Coil.get(1L), 200, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 6L), GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 6L), + GT_Utility.getIntegratedCircuit(2) }, Materials.Glue.getFluid(10), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 2L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 3L), GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 3L), + GT_Utility.getIntegratedCircuit(4) }, Materials.Glue.getFluid(20), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Wood, 4L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), GT_Utility.getIntegratedCircuit(12) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), + GT_Utility.getIntegratedCircuit(12) }, Materials.Glue.getFluid(60), GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Wood, 6L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4L), - GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 4L), - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4L), + GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 4L), + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1L), + GT_Utility.getIntegratedCircuit(2) }, GT_Values.NF, ItemList.Ingot_IridiumAlloy.get(1L), 1200, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1L), - ItemList.Electric_Motor_UV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Iridium, 1L), - ItemList.Component_Filter.get(8L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 8L), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1L), + ItemList.Electric_Motor_UV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Iridium, 1L), + ItemList.Component_Filter.get(8L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 8L), }, null, ItemList.Casing_Vent_T2.get(1L), 30 * 20, @@ -2363,151 +2205,121 @@ public class AssemblerRecipes implements Runnable { // fuel rod assembler recipes GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.ThoriumCell_1.get(2L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.ThoriumCell_1.get(2L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(2) }, null, ItemList.ThoriumCell_2.get(1L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.ThoriumCell_1.get(4L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.ThoriumCell_1.get(4L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6L), + GT_Utility.getIntegratedCircuit(4) }, null, ItemList.ThoriumCell_4.get(1L), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.ThoriumCell_2.get(2L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.ThoriumCell_2.get(2L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(5) }, null, ItemList.ThoriumCell_4.get(1L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Uraniumcell_1.get(2L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Uraniumcell_1.get(2L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(2) }, null, ItemList.Uraniumcell_2.get(1L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Uraniumcell_1.get(4L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Uraniumcell_1.get(4L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6L), + GT_Utility.getIntegratedCircuit(4) }, null, ItemList.Uraniumcell_4.get(1L), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Uraniumcell_2.get(2L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Uraniumcell_2.get(2L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(5) }, null, ItemList.Uraniumcell_4.get(1L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Moxcell_1.get(2L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Moxcell_1.get(2L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(2) }, null, ItemList.Moxcell_2.get(1L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Moxcell_1.get(4L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Moxcell_1.get(4L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6L), + GT_Utility.getIntegratedCircuit(4) }, null, ItemList.Moxcell_4.get(1L), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Moxcell_2.get(2L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Moxcell_2.get(2L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(5) }, null, ItemList.Moxcell_4.get(1L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.NaquadahCell_1.get(2L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.NaquadahCell_1.get(2L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4L), + GT_Utility.getIntegratedCircuit(2) }, null, ItemList.NaquadahCell_2.get(1L), 100, 400); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.NaquadahCell_1.get(4L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.NaquadahCell_1.get(4L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6L), + GT_Utility.getIntegratedCircuit(4) }, null, ItemList.NaquadahCell_4.get(1L), 150, 400); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.NaquadahCell_2.get(2L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.NaquadahCell_2.get(2L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4L), + GT_Utility.getIntegratedCircuit(5) }, null, ItemList.NaquadahCell_4.get(1L), 100, 400); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.MNqCell_1.get(2L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.MNqCell_1.get(2L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4L), + GT_Utility.getIntegratedCircuit(2) }, null, ItemList.MNqCell_2.get(1L), 100, 400); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.MNqCell_1.get(4L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6L), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.MNqCell_1.get(4L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6L), + GT_Utility.getIntegratedCircuit(4) }, null, ItemList.MNqCell_4.get(1L), 150, 400); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.MNqCell_2.get(2L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.MNqCell_2.get(2L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4L), + GT_Utility.getIntegratedCircuit(5) }, null, ItemList.MNqCell_4.get(1L), 100, @@ -2520,17 +2332,15 @@ public class AssemblerRecipes implements Runnable { 100, 120000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - Materials.NaquadahAlloy.getPlates(8), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1) - }, + new ItemStack[] { Materials.NaquadahAlloy.getPlates(8), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1) }, null, ItemList.RadiantNaquadahAlloyCasing.get(1), 10, 400000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.KevlarFiber.get(8L), GT_Utility.getIntegratedCircuit(8)}, + new ItemStack[] { ItemList.KevlarFiber.get(8L), GT_Utility.getIntegratedCircuit(8) }, GT_Values.NF, ItemList.WovenKevlar.get(1L), 300, @@ -2538,56 +2348,43 @@ public class AssemblerRecipes implements Runnable { for (Materials tMat : Materials.values()) { if (tMat.isProperSolderingFluid()) { - int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) - ? 1 + int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; for (ItemStack tPlate : new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L) - }) { + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L) }) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.lever, 1, 32767), tPlate, GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.lever, 1, 32767), tPlate, + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(144L * tMultiplier / 2L), ItemList.Cover_Controller.get(1L), 800, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.redstone_torch, 1, 32767), - tPlate, - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.redstone_torch, 1, 32767), tPlate, + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(144L * tMultiplier / 2L), ItemList.Cover_ActivityDetector.get(1L), 800, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), - tPlate, - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), tPlate, + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(144L * tMultiplier / 2L), ItemList.Cover_FluidDetector.get(1L), 800, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767), - tPlate, - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767), tPlate, + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(144L * tMultiplier / 2L), ItemList.Cover_ItemDetector.get(1L), 800, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_ModHandler.getIC2Item("ecMeter", 1L), tPlate, GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_ModHandler.getIC2Item("ecMeter", 1L), tPlate, + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(144L * tMultiplier / 2L), ItemList.Cover_EnergyDetector.get(1L), 800, @@ -2597,22 +2394,21 @@ public class AssemblerRecipes implements Runnable { } if (isGTNHLanthanidLoaded && isGTPPLoaded) { - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Electric_Pump_EV.get(4L), - ItemList.Field_Generator_EV.get(4L), - getModItem(MOD_ID_GTPP, "itemPlateInconel690", 4L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 4L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), - ItemList.Shape_Extruder_Wire.get(16L) - }, - Materials.SolderingAlloy.getGas(144L), - ItemList.Spinneret.get(1L), - 2400, - (int) TierEU.RECIPE_EV); + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { ItemList.Electric_Pump_EV.get(4L), ItemList.Field_Generator_EV.get(4L), + getModItem(MOD_ID_GTPP, "itemPlateInconel690", 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2L), + GT_OreDictUnificator + .get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 4L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), + ItemList.Shape_Extruder_Wire.get(16L) }, + Materials.SolderingAlloy.getGas(144L), + ItemList.Spinneret.get(1L), + 2400, + (int) TierEU.RECIPE_EV); } } @@ -2620,48 +2416,37 @@ public class AssemblerRecipes implements Runnable { * Adds new recipes for hatches and busses */ public static void addBusAndHatchRecipes() { - Materials[] glues = { - Materials.Glue, Materials.Plastic, Materials.Polytetrafluoroethylene, Materials.Polybenzimidazole - }; + Materials[] glues = { Materials.Glue, Materials.Plastic, Materials.Polytetrafluoroethylene, + Materials.Polybenzimidazole }; - ItemStack[] chests = { - isCoremodLoaded ? getModItem(MOD_ID_DC, "BabyChest", 1) : new ItemStack(Blocks.chest), - new ItemStack(Blocks.chest), - isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 3) : new ItemStack(Blocks.chest), - isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1) : new ItemStack(Blocks.chest), - isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 4) : new ItemStack(Blocks.chest), - isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 1) : new ItemStack(Blocks.chest), - isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 2) : new ItemStack(Blocks.chest), - isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 5) : new ItemStack(Blocks.chest), - isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 6) : new ItemStack(Blocks.chest), - isAvaritiaAddonsLoaded ? getModItem("avaritiaddons", "CompressedChest", 1) : new ItemStack(Blocks.chest) - }; - ItemStack[] tanks = { - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - isBuildCraftFactoryLoaded - ? getModItem("BuildCraft|Factory", "tankBlock", 1) - : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - isIronTankLoaded - ? getModItem("irontank", "copperTank", 1) - : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - isIronTankLoaded - ? getModItem("irontank", "ironTank", 1) - : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - isIronTankLoaded - ? getModItem("irontank", "silverTank", 1) - : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - isIronTankLoaded - ? getModItem("irontank", "goldTank", 1) - : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - isIronTankLoaded - ? getModItem("irontank", "diamondTank", 1) - : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - isIronTankLoaded - ? getModItem("irontank", "obsidianTank", 1) - : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - getModItem("gregtech", "gt.blockmachines", 1, 130), - getModItem("gregtech", "gt.blockmachines", 1, 131) - }; + ItemStack[] chests = { isCoremodLoaded ? getModItem(MOD_ID_DC, "BabyChest", 1) : new ItemStack(Blocks.chest), + new ItemStack(Blocks.chest), + isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 3) : new ItemStack(Blocks.chest), + isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1) : new ItemStack(Blocks.chest), + isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 4) : new ItemStack(Blocks.chest), + isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 1) : new ItemStack(Blocks.chest), + isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 2) : new ItemStack(Blocks.chest), + isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 5) : new ItemStack(Blocks.chest), + isIronChestLoaded ? getModItem("IronChest", "BlockIronChest", 1, 6) : new ItemStack(Blocks.chest), + isAvaritiaAddonsLoaded ? getModItem("avaritiaddons", "CompressedChest", 1) + : new ItemStack(Blocks.chest) }; + ItemStack[] tanks = { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), + isBuildCraftFactoryLoaded ? getModItem("BuildCraft|Factory", "tankBlock", 1) + : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), + isIronTankLoaded ? getModItem("irontank", "copperTank", 1) + : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), + isIronTankLoaded ? getModItem("irontank", "ironTank", 1) + : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), + isIronTankLoaded ? getModItem("irontank", "silverTank", 1) + : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), + isIronTankLoaded ? getModItem("irontank", "goldTank", 1) + : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), + isIronTankLoaded ? getModItem("irontank", "diamondTank", 1) + : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), + isIronTankLoaded ? getModItem("irontank", "obsidianTank", 1) + : GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), + getModItem("gregtech", "gt.blockmachines", 1, 130), + getModItem("gregtech", "gt.blockmachines", 1, 131) }; ItemStack[][] aInputs = new ItemStack[10][3]; ItemStack[][] aInputs2 = new ItemStack[10][3]; @@ -2669,18 +2454,14 @@ public class AssemblerRecipes implements Runnable { ItemStack[][] flInputs2 = new ItemStack[10][3]; for (int i = 0; i < 10; i++) { - aInputs[i] = new ItemStack[] { - ItemList.MACHINE_HULLS[i].get(1), chests[i].copy(), GT_Utility.getIntegratedCircuit(1) - }; - aInputs2[i] = new ItemStack[] { - ItemList.MACHINE_HULLS[i].get(1), chests[i].copy(), GT_Utility.getIntegratedCircuit(2) - }; - flInputs[i] = new ItemStack[] { - ItemList.MACHINE_HULLS[i].get(1), tanks[i].copy(), GT_Utility.getIntegratedCircuit(1) - }; - flInputs2[i] = new ItemStack[] { - ItemList.MACHINE_HULLS[i].get(1), tanks[i].copy(), GT_Utility.getIntegratedCircuit(2) - }; + aInputs[i] = new ItemStack[] { ItemList.MACHINE_HULLS[i].get(1), chests[i].copy(), + GT_Utility.getIntegratedCircuit(1) }; + aInputs2[i] = new ItemStack[] { ItemList.MACHINE_HULLS[i].get(1), chests[i].copy(), + GT_Utility.getIntegratedCircuit(2) }; + flInputs[i] = new ItemStack[] { ItemList.MACHINE_HULLS[i].get(1), tanks[i].copy(), + GT_Utility.getIntegratedCircuit(1) }; + flInputs2[i] = new ItemStack[] { ItemList.MACHINE_HULLS[i].get(1), tanks[i].copy(), + GT_Utility.getIntegratedCircuit(2) }; } for (int aTier = 0; aTier < 10; aTier++) { @@ -2812,231 +2593,183 @@ public class AssemblerRecipes implements Runnable { private void loadRailcraftRecipes() { if (!isRailcraftLoaded) return; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.stone_slab, 1, 0), - ItemList.RC_Rebar.get(1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.stone_slab, 1, 0), ItemList.RC_Rebar.get(1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.RC_Tie_Stone.get(1L), 128, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.stone_slab, 1, 7), - ItemList.RC_Rebar.get(1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.stone_slab, 1, 7), ItemList.RC_Rebar.get(1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.RC_Tie_Stone.get(1L), 128, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), - GT_Utility.getIntegratedCircuit(8) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), + GT_Utility.getIntegratedCircuit(8) }, Materials.Blaze.getMolten(216L), ItemList.RC_Rail_HS.get(16L), 100, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), - GT_Utility.getIntegratedCircuit(9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), + GT_Utility.getIntegratedCircuit(9) }, Materials.ConductiveIron.getMolten(432L), ItemList.RC_Rail_HS.get(8L), 100, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), - GT_Utility.getIntegratedCircuit(9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), + GT_Utility.getIntegratedCircuit(9) }, Materials.VibrantAlloy.getMolten(216L), ItemList.RC_Rail_HS.get(32L), 100, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), - GT_Utility.getIntegratedCircuit(9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), + GT_Utility.getIntegratedCircuit(9) }, Materials.CrystallineAlloy.getMolten(216L), ItemList.RC_Rail_HS.get(64L), 100, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(3L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), - GT_Utility.getIntegratedCircuit(8) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(3L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), + GT_Utility.getIntegratedCircuit(8) }, Materials.Redstone.getMolten(216L), ItemList.RC_Rail_Adv.get(8L), 100, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(3L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), - GT_Utility.getIntegratedCircuit(8) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(3L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), + GT_Utility.getIntegratedCircuit(8) }, Materials.RedAlloy.getMolten(216L), ItemList.RC_Rail_Adv.get(16L), 100, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(3L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), - GT_Utility.getIntegratedCircuit(8) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(3L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), + GT_Utility.getIntegratedCircuit(8) }, Materials.ConductiveIron.getMolten(216L), ItemList.RC_Rail_Adv.get(32L), 100, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(3L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), - GT_Utility.getIntegratedCircuit(8) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(3L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3L), + GT_Utility.getIntegratedCircuit(8) }, Materials.VibrantAlloy.getMolten(216L), ItemList.RC_Rail_Adv.get(64L), 100, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.RC_Rail_Electric.get(1L), 50, 4); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.RC_Rail_Electric.get(1L), 50, 4); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.RC_Rail_Electric.get(2L), 50, 4); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.RC_Rail_Electric.get(4L), 50, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.RC_Rail_Electric.get(8L), 50, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.RC_Rail_Electric.get(16L), 50, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.HSSG, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.HSSG, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.RC_Rail_Electric.get(32L), 50, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Rail_Standard.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.RC_Rail_Standard.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.RC_Rail_Electric.get(64L), 50, 96); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Tie_Wood.get(1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1L), - GT_Utility.getIntegratedCircuit(10) - }, + new ItemStack[] { ItemList.RC_Tie_Wood.get(1L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1L), + GT_Utility.getIntegratedCircuit(10) }, GT_Values.NF, ItemList.RC_Rail_Wooden.get(8L), 133, 4); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Tie_Wood.get(1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1L), - GT_Utility.getIntegratedCircuit(11) - }, + new ItemStack[] { ItemList.RC_Tie_Wood.get(1L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1L), + GT_Utility.getIntegratedCircuit(11) }, GT_Values.NF, ItemList.RC_Rail_Wooden.get(8L), 133, 4); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Tie_Wood.get(1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1L), - GT_Utility.getIntegratedCircuit(11) - }, + new ItemStack[] { ItemList.RC_Tie_Wood.get(1L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1L), + GT_Utility.getIntegratedCircuit(11) }, GT_Values.NF, ItemList.RC_Rail_Wooden.get(16L), 133, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Tie_Wood.get(1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1L), - GT_Utility.getIntegratedCircuit(11) - }, + new ItemStack[] { ItemList.RC_Tie_Wood.get(1L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1L), + GT_Utility.getIntegratedCircuit(11) }, GT_Values.NF, ItemList.RC_Rail_Wooden.get(32L), 133, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Tie_Wood.get(1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(11) - }, + new ItemStack[] { ItemList.RC_Tie_Wood.get(1L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(11) }, GT_Values.NF, ItemList.RC_Rail_Wooden.get(64L), 133, @@ -3077,42 +2810,33 @@ public class AssemblerRecipes implements Runnable { tRailWoodB.stackTagCompound = tTagWoodB; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Bed_Wood.get(1L), - ItemList.RC_Rail_Wooden.get(6L), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { ItemList.RC_Bed_Wood.get(1L), ItemList.RC_Rail_Wooden.get(6L), + GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, tRailWood, 100, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, tRailWoodB, 200, (int) TierEU.RECIPE_LV); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 1, 0), - ItemList.RC_Rail_Adv.get(2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 1, 0), ItemList.RC_Rail_Adv.get(2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, new ItemStack(Blocks.golden_rail, 16, 0), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Bed_Wood.get(1L), ItemList.RC_Rail_Standard.get(6L), GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { ItemList.RC_Bed_Wood.get(1L), ItemList.RC_Rail_Standard.get(6L), + GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, new ItemStack(Blocks.rail, 64, 0), 200, @@ -3124,11 +2848,8 @@ public class AssemblerRecipes implements Runnable { tRailRe.stackTagCompound = tTagRe; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Bed_Stone.get(1L), - ItemList.RC_Rail_Reinforced.get(6L), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { ItemList.RC_Bed_Stone.get(1L), ItemList.RC_Rail_Reinforced.get(6L), + GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, tRailRe, 200, @@ -3140,11 +2861,9 @@ public class AssemblerRecipes implements Runnable { tRailReB.stackTagCompound = tTagReB; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, tRailReB, 300, @@ -3156,11 +2875,8 @@ public class AssemblerRecipes implements Runnable { tRailEl.stackTagCompound = tTagEl; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Bed_Stone.get(1L), - ItemList.RC_Rail_Electric.get(6L), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { ItemList.RC_Bed_Stone.get(1L), ItemList.RC_Rail_Electric.get(6L), + GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, tRailEl, 200, @@ -3173,9 +2889,8 @@ public class AssemblerRecipes implements Runnable { tRailHs.stackTagCompound = tTagHs; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.RC_Bed_Stone.get(1L), ItemList.RC_Rail_HS.get(6L), GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { ItemList.RC_Bed_Stone.get(1L), ItemList.RC_Rail_HS.get(6L), + GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, tRailHs, 200, @@ -3187,11 +2902,9 @@ public class AssemblerRecipes implements Runnable { tRailHsB.stackTagCompound = tTagHsB; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, tRailHsB, 300, @@ -3205,71 +2918,57 @@ public class AssemblerRecipes implements Runnable { tRailSS.stackTagCompound = tTagSS; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.AnyIron, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.AnyIron, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailSS, 100, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailSS), 100, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailSS), 100, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailSS), 100, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailSS), 100, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailSS), 100, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailSS), 100, @@ -3283,71 +2982,57 @@ public class AssemblerRecipes implements Runnable { tRailSW.stackTagCompound = tTagSW; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.AnyIron, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.AnyIron, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailSW, 100, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailSW), 100, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailSW), 100, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailSW), 100, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailSW), 100, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailSW), 100, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailSW), 100, @@ -3361,71 +3046,57 @@ public class AssemblerRecipes implements Runnable { tRailSJ.stackTagCompound = tTagSJ; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.AnyIron, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.AnyIron, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailSJ, 100, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailSJ), 100, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailSJ), 100, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailSJ), 100, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailSJ), 100, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailSJ), 100, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailSJ), 100, @@ -3439,71 +3110,57 @@ public class AssemblerRecipes implements Runnable { tRailNS.stackTagCompound = tTagNS; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailNS, 200, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailNS), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailNS), 200, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailNS), 200, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailNS), 200, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailNS), 200, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailNS), 200, @@ -3517,71 +3174,57 @@ public class AssemblerRecipes implements Runnable { tRailNW.stackTagCompound = tTagNW; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailNW, 200, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailNW), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailNW), 200, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailNW), 200, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailNW), 200, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailNW), 200, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailNW), 200, @@ -3595,71 +3238,57 @@ public class AssemblerRecipes implements Runnable { tRailNJ.stackTagCompound = tTagNJ; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailNJ, 200, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailNJ), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailNJ), 200, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailNJ), 200, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailNJ), 200, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailNJ), 200, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailNJ), 200, @@ -3673,71 +3302,57 @@ public class AssemblerRecipes implements Runnable { tRailRS.stackTagCompound = tTagRS; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailRS, 300, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailRS), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailRS), 300, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailRS), 300, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailRS), 300, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailRS), 300, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailRS), 300, @@ -3751,71 +3366,57 @@ public class AssemblerRecipes implements Runnable { tRailRW.stackTagCompound = tTagRW; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailRW, 300, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailRW), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailRW), 300, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailRW), 300, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailRW), 300, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailRW), 300, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailRW), 300, @@ -3829,71 +3430,57 @@ public class AssemblerRecipes implements Runnable { tRailRJ.stackTagCompound = tTagRJ; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailRJ, 300, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailRJ), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailRJ), 300, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailRJ), 300, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailRJ), 300, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailRJ), 300, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailRJ), 300, @@ -3907,71 +3494,57 @@ public class AssemblerRecipes implements Runnable { tRailSSw.stackTagCompound = tTagRSSw; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailSSw, 400, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailSSw), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailSSw), 400, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailSSw), 400, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailSSw), 400, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailSSw), 400, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailSSw), 400, @@ -3985,71 +3558,57 @@ public class AssemblerRecipes implements Runnable { tRailSWy.stackTagCompound = tTagRSWy; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailSWy, 400, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailSWy), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailSWy), 400, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailSWy), 400, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailSWy), 400, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailSWy), 400, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailSWy), 400, @@ -4063,56 +3622,41 @@ public class AssemblerRecipes implements Runnable { tRailSTt.stackTagCompound = tTagRSTt; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - ItemList.RC_Bed_Stone.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), ItemList.RC_Bed_Stone.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailSTt), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - ItemList.RC_Bed_Stone.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ConductiveIron, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), ItemList.RC_Bed_Stone.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ConductiveIron, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailSTt), 400, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - ItemList.RC_Bed_Stone.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), ItemList.RC_Bed_Stone.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailSTt), 400, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - ItemList.RC_Bed_Stone.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), ItemList.RC_Bed_Stone.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailSTt), 400, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailHs), - ItemList.RC_Bed_Stone.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MelodicAlloy, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), ItemList.RC_Bed_Stone.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MelodicAlloy, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailSTt), 400, @@ -4126,71 +3670,57 @@ public class AssemblerRecipes implements Runnable { tRailES.stackTagCompound = tTagES; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Copper, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Copper, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailES, 400, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Gold, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Gold, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailES), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Electrum, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Electrum, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailES), 400, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailES), 400, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Platinum, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Platinum, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailES), 400, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.VanadiumGallium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.VanadiumGallium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailES), 400, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Naquadah, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Naquadah, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailES), 400, @@ -4204,71 +3734,57 @@ public class AssemblerRecipes implements Runnable { tRailEw.stackTagCompound = tTagEw; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Copper, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Copper, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailEw, 400, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Gold, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Gold, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailEw), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Electrum, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Electrum, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailEw), 400, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailEw), 400, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailEw), 400, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.VanadiumGallium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.VanadiumGallium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailEw), 400, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Naquadah, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Naquadah, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailEw), 400, @@ -4282,71 +3798,57 @@ public class AssemblerRecipes implements Runnable { tRailEJ.stackTagCompound = tTagREJ; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Copper, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Copper, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, tRailEJ, 400, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Gold, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Gold, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(2, tRailEJ), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(4, tRailEJ), 400, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(8, tRailEJ), 400, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Platinum, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Platinum, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(16, tRailEJ), 400, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.VanadiumGallium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.VanadiumGallium, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(32, tRailEJ), 400, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Naquadah, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Naquadah, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, GT_Utility.copyAmount(64, tRailEJ), 400, @@ -4355,88 +3857,70 @@ public class AssemblerRecipes implements Runnable { // Shunting Wire for (Materials tMat : Materials.values()) { if (tMat.isProperSolderingFluid()) { - int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) - ? 1 + int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1L), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(16L * tMultiplier / 2L), ItemList.RC_ShuntingWire.get(1L), 200, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1L), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(16L * tMultiplier / 2L), ItemList.RC_ShuntingWire.get(1L), 200, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1L), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(16L * tMultiplier / 2L), ItemList.RC_ShuntingWire.get(4L), 200, 24); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1L), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(16L * tMultiplier / 2L), ItemList.RC_ShuntingWire.get(8L), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1L), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(16L * tMultiplier / 2L), ItemList.RC_ShuntingWire.get(16L), 200, 48); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(16L * tMultiplier / 2L), ItemList.RC_ShuntingWire.get(32L), 200, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1L), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(16L * tMultiplier / 2L), ItemList.RC_ShuntingWire.get(64L), 200, (int) TierEU.RECIPE_MV); // chunkloader upgrade OC GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Plastic_Advanced.get(1L), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2L), - getModItem(MOD_ID_RC, "machine.alpha", 1L, 0), - getModItem("OpenComputers", "item", 1L, 26), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Circuit_Board_Plastic_Advanced.get(1L), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2L), + getModItem(MOD_ID_RC, "machine.alpha", 1L, 0), + getModItem("OpenComputers", "item", 1L, 26), GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(144L * tMultiplier / 2L), getModItem("OpenComputers", "item", 1L, 62), 250, @@ -4445,76 +3929,60 @@ public class AssemblerRecipes implements Runnable { } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.piston, 1, 0), - ItemList.FR_Casing_Sturdy.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.piston, 1, 0), ItemList.FR_Casing_Sturdy.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1L), + GT_Utility.getIntegratedCircuit(1) }, Materials.SeedOil.getFluid(250L), getModItem(MOD_ID_DC, "item.EngineCore", 1L, 0), 100, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(Blocks.piston, 1, 0), - ItemList.FR_Casing_Sturdy.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { new ItemStack(Blocks.piston, 1, 0), ItemList.FR_Casing_Sturdy.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1L), + GT_Utility.getIntegratedCircuit(1) }, Materials.Lubricant.getFluid(125L), getModItem(MOD_ID_DC, "item.EngineCore", 1L, 0), 100, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getModItem("ExtraUtilities", "trashcan", 1L, 0), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { getModItem("ExtraUtilities", "trashcan", 1L, 0), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 4L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 1L, 11), 200, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getModItem(MOD_ID_DC, "item.EngineCore", 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyCopper, 10L), - GT_Utility.getIntegratedCircuit(10) - }, + new ItemStack[] { getModItem(MOD_ID_DC, "item.EngineCore", 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyCopper, 10L), + GT_Utility.getIntegratedCircuit(10) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 1L, 7), 200, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getModItem(MOD_ID_DC, "item.EngineCore", 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 10L), - GT_Utility.getIntegratedCircuit(10) - }, + new ItemStack[] { getModItem(MOD_ID_DC, "item.EngineCore", 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 10L), + GT_Utility.getIntegratedCircuit(10) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 1L, 8), 200, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getModItem(MOD_ID_DC, "item.EngineCore", 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 10L), - GT_Utility.getIntegratedCircuit(10) - }, + new ItemStack[] { getModItem(MOD_ID_DC, "item.EngineCore", 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 10L), + GT_Utility.getIntegratedCircuit(10) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 1L, 9), 200, 16); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 4L), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 4L), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 2L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.alpha", 1, 0), 600, @@ -4527,70 +3995,50 @@ public class AssemblerRecipes implements Runnable { 600, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2L), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2L), + new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 2L, 1), 800, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2L), - getModItem("TConstruct", "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2L), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 2L, 1), 800, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Bronze, 2L), - new ItemStack(Blocks.iron_bars, 2, 0), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Bronze, 2L), + new ItemStack(Blocks.iron_bars, 2, 0), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 1L, 2), 800, (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L), - GT_Utility.getIntegratedCircuit(20) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L), + GT_Utility.getIntegratedCircuit(20) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 1L, 13), 200, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L), + new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 2L, 14), 400, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L), - getModItem("TConstruct", "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 2L, 14), 400, 64); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2L), - getModItem(MOD_ID_DC, "item.SteelBars", 2L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2L), + getModItem(MOD_ID_DC, "item.SteelBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 1L, 15), 400, @@ -4602,70 +4050,50 @@ public class AssemblerRecipes implements Runnable { 600, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), + new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 1), 800, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), - getModItem("TConstruct", "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 1), 800, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Plastic, 2L), - getModItem(MOD_ID_DC, "item.AluminiumBars", 2L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Plastic, 2L), + getModItem(MOD_ID_DC, "item.AluminiumBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), 800, (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), - GT_Utility.getIntegratedCircuit(20) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), + GT_Utility.getIntegratedCircuit(20) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), 200, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), + new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 4), 400, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), - getModItem("TConstruct", "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 4), 400, 256); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2L), - getModItem(MOD_ID_DC, "item.StainlessSteelBars", 2L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2L), + getModItem(MOD_ID_DC, "item.StainlessSteelBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), 400, @@ -4677,70 +4105,50 @@ public class AssemblerRecipes implements Runnable { 600, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2L), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2L), + new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 7), 800, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2L), - getModItem("TConstruct", "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2L), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 7), 800, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2L), - getModItem(MOD_ID_DC, "item.TitaniumBars", 2L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2L), + getModItem(MOD_ID_DC, "item.TitaniumBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), 800, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L), - GT_Utility.getIntegratedCircuit(20) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L), + GT_Utility.getIntegratedCircuit(20) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), 200, 960); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L), + new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 10), 400, 960); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L), - getModItem("TConstruct", "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 10), 400, 960); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 2L), - getModItem(MOD_ID_DC, "item.TungstenSteelBars", 2L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 2L), + getModItem(MOD_ID_DC, "item.TungstenSteelBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), 400, @@ -4752,70 +4160,50 @@ public class AssemblerRecipes implements Runnable { 600, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2L), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2L), + new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 13), 800, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2L), - getModItem("TConstruct", "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2L), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 13), 800, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2L), - getModItem(MOD_ID_DC, "item.ChromeBars", 2L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2L), + getModItem(MOD_ID_DC, "item.ChromeBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), 800, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2L), - GT_Utility.getIntegratedCircuit(20) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2L), + GT_Utility.getIntegratedCircuit(20) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 1L, 0), 200, 4096); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2L), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2L), + new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 2L, 1), 400, 4096); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2L), - getModItem("TConstruct", "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2L), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 2L, 1), 400, 4096); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 2L), - getModItem(MOD_ID_DC, "item.IridiumBars", 2L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 2L), + getModItem(MOD_ID_DC, "item.IridiumBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 1L, 2), 400, @@ -4827,130 +4215,98 @@ public class AssemblerRecipes implements Runnable { 600, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2L), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2L), + new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 2L, 4), 800, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2L), - getModItem("TConstruct", "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2L), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 2L, 4), 800, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2L), - getModItem(MOD_ID_DC, "item.OsmiumBars", 2L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2L), + getModItem(MOD_ID_DC, "item.OsmiumBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 1L, 5), 800, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), - GT_Utility.getIntegratedCircuit(20) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), + GT_Utility.getIntegratedCircuit(20) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 1L, 6), 200, (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), + new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 2L, 7), 400, (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), - getModItem("TConstruct", "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), + getModItem("TConstruct", "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 2L, 7), 400, (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2L), - getModItem(MOD_ID_DC, "item.NeutroniumBars", 2L), - GT_Utility.getIntegratedCircuit(22) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2L), + getModItem(MOD_ID_DC, "item.NeutroniumBars", 2L), GT_Utility.getIntegratedCircuit(22) }, GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 1L, 8), 400, (int) TierEU.RECIPE_LuV); // Water Tank GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2L) }, Materials.Glue.getFluid(36L), getModItem(MOD_ID_RC, "machine.alpha", 1L, 14), 200, 8, false); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2L) }, Materials.Glue.getFluid(36L), getModItem(MOD_ID_RC, "machine.alpha", 1L, 14), 200, 8, false); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2L) }, Materials.Glue.getFluid(36L), getModItem(MOD_ID_RC, "machine.alpha", 1L, 14), 200, 8, false); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 4L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 4L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 4L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 4L) }, Materials.Glue.getFluid(72L), getModItem(MOD_ID_RC, "machine.alpha", 3L, 14), 400, 30, false); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 2L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 1L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 2L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 1L) }, Materials.Plastic.getMolten(36L), getModItem(MOD_ID_RC, "machine.alpha", 3L, 14), 400, 30, false); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.StainlessSteel, 4L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 4L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.StainlessSteel, 4L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 4L) }, Materials.Plastic.getMolten(72L), getModItem(MOD_ID_RC, "machine.alpha", 9L, 14), 400, @@ -4985,32 +4341,26 @@ public class AssemblerRecipes implements Runnable { public void withGalacticraftMars() { if (isGalacticraftMarsLoaded) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Bronze, 1L), - GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Aluminium, 1L), - GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Steel, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Bronze, 1L), + GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Aluminium, 1L), + GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Steel, 1L), + GT_Utility.getIntegratedCircuit(1) }, Materials.StainlessSteel.getMolten(72L), ItemList.Ingot_Heavy1.get(1L), 300, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getModItem("GalacticraftCore", "item.heavyPlating", 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MeteoricIron, 2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { getModItem("GalacticraftCore", "item.heavyPlating", 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MeteoricIron, 2L), + GT_Utility.getIntegratedCircuit(1) }, Materials.TungstenSteel.getMolten(72L), ItemList.Ingot_Heavy2.get(1L), 300, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getModItem("GalacticraftMars", "item.null", 1L, 3), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { getModItem("GalacticraftMars", "item.null", 1L, 3), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 4L), + GT_Utility.getIntegratedCircuit(1) }, Materials.Platinum.getMolten(72L), ItemList.Ingot_Heavy3.get(1L), 300, @@ -5020,144 +4370,122 @@ public class AssemblerRecipes implements Runnable { public void withGalaxySPace() { if (isGalaxySpaceLoaded) { + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2L), + ItemList.Electric_Pump_MV.get(1L), GT_Utility.getIntegratedCircuit(9) }, + new FluidStack(FluidRegistry.getFluid("liquid helium"), 2000), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3L), + 320, + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2L), - ItemList.Electric_Pump_MV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, - new FluidStack(FluidRegistry.getFluid("liquid helium"), 2000), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3L), - 320, - (int) TierEU.RECIPE_MV); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4L), - ItemList.Electric_Pump_HV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4L), + ItemList.Electric_Pump_HV.get(1L), GT_Utility.getIntegratedCircuit(9) }, new FluidStack(FluidRegistry.getFluid("liquid helium"), 4000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6L), 320, (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6L), - ItemList.Electric_Pump_EV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6L), + ItemList.Electric_Pump_EV.get(1L), GT_Utility.getIntegratedCircuit(9) }, new FluidStack(FluidRegistry.getFluid("liquid helium"), 6000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9L), 320, (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8L), - ItemList.Electric_Pump_IV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8L), + ItemList.Electric_Pump_IV.get(1L), GT_Utility.getIntegratedCircuit(9) }, new FluidStack(FluidRegistry.getFluid("liquid helium"), 8000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12L), 640, (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, - Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, - 15L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10L), - ItemList.Electric_Pump_LuV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, + 15L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10L), + ItemList.Electric_Pump_LuV.get(1L), GT_Utility.getIntegratedCircuit(9) }, new FluidStack(FluidRegistry.getFluid("liquid helium"), 12000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15L), 640, (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12L), - ItemList.Electric_Pump_ZPM.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12L), + ItemList.Electric_Pump_ZPM.get(1L), GT_Utility.getIntegratedCircuit(9) }, new FluidStack(FluidRegistry.getFluid("liquid helium"), 16000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18L), 1280, (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14L), - ItemList.Electric_Pump_UV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14L), + ItemList.Electric_Pump_UV.get(1L), GT_Utility.getIntegratedCircuit(9) }, new FluidStack(FluidRegistry.getFluid("liquid helium"), 20000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21L), 1280, (int) TierEU.RECIPE_UV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16L), - ItemList.Electric_Pump_UHV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16L), + ItemList.Electric_Pump_UHV.get(1L), GT_Utility.getIntegratedCircuit(9) }, new FluidStack(FluidRegistry.getFluid("liquid helium"), 24000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24L), 2560, (int) TierEU.RECIPE_UHV); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 27L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Infinity, 18L), - ItemList.Electric_Pump_UEV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, - new FluidStack(FluidRegistry.getFluid("liquid helium"), 28000), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 27L), - 3200, - (int) TierEU.RECIPE_UEV); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.SpaceTime, 22L), - ItemList.Electric_Pump_UMV.get(1L), - GT_Utility.getIntegratedCircuit(9) - }, - new FluidStack(FluidRegistry.getFluid("liquid helium"), 36000), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33L), - 3200, - (int) TierEU.RECIPE_UMV); + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 27L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Infinity, 18L), + ItemList.Electric_Pump_UEV.get(1L), GT_Utility.getIntegratedCircuit(9) }, + new FluidStack(FluidRegistry.getFluid("liquid helium"), 28000), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 27L), + 3200, + (int) TierEU.RECIPE_UEV); + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.SpaceTime, 22L), + ItemList.Electric_Pump_UMV.get(1L), GT_Utility.getIntegratedCircuit(9) }, + new FluidStack(FluidRegistry.getFluid("liquid helium"), 36000), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33L), + 3200, + (int) TierEU.RECIPE_UMV); } } public void withoutGTPPRecipes() { if (!isGTPPLoaded) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), - ItemList.Circuit_Silicon_Wafer4.get(2L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), + ItemList.Circuit_Silicon_Wafer4.get(2L), GT_Utility.getIntegratedCircuit(1) }, Materials.AdvancedGlue.getFluid(500L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64), 400, (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), - ItemList.Circuit_Silicon_Wafer5.get(1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), + ItemList.Circuit_Silicon_Wafer5.get(1L), GT_Utility.getIntegratedCircuit(1) }, Materials.AdvancedGlue.getFluid(250L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64), 80, diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index 35569431a4..72107b6df1 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -1,21 +1,23 @@ package gregtech.loaders.postload.recipes; -import gregtech.api.enums.*; -import gregtech.api.util.GT_OreDictUnificator; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.enums.*; +import gregtech.api.util.GT_OreDictUnificator; + public class AssemblyLineRecipes implements Runnable { + @Override public void run() { // recipe len: - // LUV 6 72000 600 32k - // ZPM 9 144000 1200 125k - // UV- 12 288000 1800 500k - // UV+/UHV- 14 360000 2100 2000k - // UHV+ 16 576000 2400 4000k + // LUV 6 72000 600 32k + // ZPM 9 144000 1200 125k + // UV- 12 288000 1800 500k + // UV+/UHV- 14 360000 2100 2000k + // UHV+ 16 576000 2400 4000k // addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] // aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt); @@ -28,14 +30,12 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Electric_Motor_IV.get(1, new Object() {}), 144000, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250) }, ItemList.Electric_Motor_LuV.get(1), 600, 6000); @@ -43,17 +43,15 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Electric_Motor_LuV.get(1, new Object() {}), 144000, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 16L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 16L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750) }, ItemList.Electric_Motor_ZPM.get(1), 600, 24000); @@ -61,24 +59,19 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Electric_Motor_ZPM.get(1, new Object() {}), 288000, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 16L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2L) - }, - new FluidStack[] { - Materials.Naquadria.getMolten(1296), - new FluidStack(solderIndalloy, 1296), - Materials.Lubricant.getFluid(2000) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 16L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2L) }, + new FluidStack[] { Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 1296), + Materials.Lubricant.getFluid(2000) }, ItemList.Electric_Motor_UV.get(1), 600, 100000); @@ -87,16 +80,14 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Electric_Pump_IV.get(1, new Object() {}), 144000, - new Object[] { - ItemList.Electric_Motor_LuV.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NiobiumTitanium, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.HSSS, 8L), - new Object[] {OrePrefixes.ring.get(Materials.AnySyntheticRubber), 4L}, - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.HSSS, 2L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)}, + new Object[] { ItemList.Electric_Motor_LuV.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NiobiumTitanium, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.HSSS, 8L), + new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 4L }, + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.HSSS, 2L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250) }, ItemList.Electric_Pump_LuV.get(1), 600, 6000); @@ -104,16 +95,14 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Electric_Pump_LuV.get(1, new Object() {}), 144000, - new Object[] { - ItemList.Electric_Motor_ZPM.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 8L), - new Object[] {OrePrefixes.ring.get(Materials.AnySyntheticRubber), 8L}, - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 2L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)}, + new Object[] { ItemList.Electric_Motor_ZPM.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 8L), + new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 8L }, + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 2L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750) }, ItemList.Electric_Pump_ZPM.get(1), 600, 24000); @@ -121,20 +110,15 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Electric_Pump_ZPM.get(1, new Object() {}), 288000, - new Object[] { - ItemList.Electric_Motor_UV.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 8L), - new Object[] {OrePrefixes.ring.get(Materials.AnySyntheticRubber), 16L}, - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 2L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2L) - }, - new FluidStack[] { - Materials.Naquadria.getMolten(1296), - new FluidStack(solderIndalloy, 1296), - Materials.Lubricant.getFluid(2000) - }, + new Object[] { ItemList.Electric_Motor_UV.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 8L), + new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 16L }, + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2L) }, + new FluidStack[] { Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 1296), + Materials.Lubricant.getFluid(2000) }, ItemList.Electric_Pump_UV.get(1), 600, 100000); @@ -143,15 +127,13 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Conveyor_Module_IV.get(1, new Object() {}), 144000, - new Object[] { - ItemList.Electric_Motor_LuV.get(2, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2L), - new Object[] {OrePrefixes.plate.get(Materials.AnySyntheticRubber), 10L}, - }, - new FluidStack[] {new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)}, + new Object[] { ItemList.Electric_Motor_LuV.get(2, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2L), + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 10L }, }, + new FluidStack[] { new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250) }, ItemList.Conveyor_Module_LuV.get(1), 600, 6000); @@ -159,15 +141,13 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Conveyor_Module_LuV.get(1, new Object() {}), 144000, - new Object[] { - ItemList.Electric_Motor_ZPM.get(2, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2L), - new Object[] {OrePrefixes.plate.get(Materials.AnySyntheticRubber), 20L}, - }, - new FluidStack[] {new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)}, + new Object[] { ItemList.Electric_Motor_ZPM.get(2, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2L), + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 20L }, }, + new FluidStack[] { new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750) }, ItemList.Conveyor_Module_ZPM.get(1), 600, 24000); @@ -175,19 +155,14 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Conveyor_Module_ZPM.get(1, new Object() {}), 288000, - new Object[] { - ItemList.Electric_Motor_UV.get(2, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2L), - new Object[] {OrePrefixes.plate.get(Materials.AnySyntheticRubber), 40L} - }, - new FluidStack[] { - Materials.Naquadria.getMolten(1296), - new FluidStack(solderIndalloy, 1296), - Materials.Lubricant.getFluid(2000) - }, + new Object[] { ItemList.Electric_Motor_UV.get(2, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2L), + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 40L } }, + new FluidStack[] { Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 1296), + Materials.Lubricant.getFluid(2000) }, ItemList.Conveyor_Module_UV.get(1), 600, 100000); @@ -196,17 +171,15 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Electric_Piston_IV.get(1, new Object() {}), 144000, - new ItemStack[] { - ItemList.Electric_Motor_LuV.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.HSSS, 4L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 2L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 4L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)}, + new ItemStack[] { ItemList.Electric_Motor_LuV.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.HSSS, 4L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 2L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 4L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250) }, ItemList.Electric_Piston_LuV.get(1), 600, 6000); @@ -214,17 +187,15 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Electric_Piston_LuV.get(1, new Object() {}), 144000, - new ItemStack[] { - ItemList.Electric_Motor_ZPM.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 4L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 2L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 4L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)}, + new ItemStack[] { ItemList.Electric_Motor_ZPM.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 4L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 2L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 4L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750) }, ItemList.Electric_Piston_ZPM.get(1), 600, 24000); @@ -232,21 +203,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Electric_Piston_ZPM.get(1, new Object() {}), 288000, - new ItemStack[] { - ItemList.Electric_Motor_UV.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 2L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 4L) - }, - new FluidStack[] { - Materials.Naquadria.getMolten(1296), - new FluidStack(solderIndalloy, 1296), - Materials.Lubricant.getFluid(2000) - }, + new ItemStack[] { ItemList.Electric_Motor_UV.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 4L) }, + new FluidStack[] { Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 1296), + Materials.Lubricant.getFluid(2000) }, ItemList.Electric_Piston_UV.get(1), 600, 100000); @@ -255,18 +221,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Robot_Arm_IV.get(1, new Object() {}), 144000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 4L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 3L), - ItemList.Electric_Motor_LuV.get(2, new Object() {}), - ItemList.Electric_Piston_LuV.get(1, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Master), 2}, - new Object[] {OrePrefixes.circuit.get(Materials.Elite), 4}, - new Object[] {OrePrefixes.circuit.get(Materials.Data), 8}, - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 576), Materials.Lubricant.getFluid(250)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 4L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 3L), + ItemList.Electric_Motor_LuV.get(2, new Object() {}), + ItemList.Electric_Piston_LuV.get(1, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Data), 8 }, + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 576), Materials.Lubricant.getFluid(250) }, ItemList.Robot_Arm_LuV.get(1), 600, 6000); @@ -274,18 +238,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Robot_Arm_LuV.get(1, new Object() {}), 144000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 3L), - ItemList.Electric_Motor_ZPM.get(2, new Object() {}), - ItemList.Electric_Piston_ZPM.get(1, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 2}, - new Object[] {OrePrefixes.circuit.get(Materials.Master), 4}, - new Object[] {OrePrefixes.circuit.get(Materials.Elite), 8}, - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 1152), Materials.Lubricant.getFluid(750)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 3L), + ItemList.Electric_Motor_ZPM.get(2, new Object() {}), + ItemList.Electric_Piston_ZPM.get(1, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Elite), 8 }, + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 1152), Materials.Lubricant.getFluid(750) }, ItemList.Robot_Arm_ZPM.get(1), 600, 24000); @@ -293,22 +255,17 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Robot_Arm_ZPM.get(1, new Object() {}), 288000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3L), - ItemList.Electric_Motor_UV.get(2, new Object() {}), - ItemList.Electric_Piston_UV.get(1, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 2}, - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 4}, - new Object[] {OrePrefixes.circuit.get(Materials.Master), 8}, - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 6L) - }, - new FluidStack[] { - Materials.Naquadria.getMolten(1296), - new FluidStack(solderIndalloy, 2304), - Materials.Lubricant.getFluid(2000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3L), + ItemList.Electric_Motor_UV.get(2, new Object() {}), + ItemList.Electric_Piston_UV.get(1, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Master), 8 }, + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 6L) }, + new FluidStack[] { Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304), + Materials.Lubricant.getFluid(2000) }, ItemList.Robot_Arm_UV.get(1), 600, 100000); @@ -317,18 +274,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Emitter_IV.get(1, new Object() {}), 144000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1L), - ItemList.Electric_Motor_LuV.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8L), - ItemList.QuantumStar.get(1, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Master), 4}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 576)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1L), + ItemList.Electric_Motor_LuV.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8L), + ItemList.QuantumStar.get(1, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 576) }, ItemList.Emitter_LuV.get(1), 600, 6000); @@ -336,18 +291,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Emitter_LuV.get(1, new Object() {}), 144000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1L), - ItemList.Electric_Motor_ZPM.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8L), - ItemList.QuantumStar.get(2, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 4}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 1152)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1L), + ItemList.Electric_Motor_ZPM.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8L), + ItemList.QuantumStar.get(2, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 1152) }, ItemList.Emitter_ZPM.get(1), 600, 24000); @@ -355,18 +308,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Emitter_ZPM.get(1, new Object() {}), 288000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L), - ItemList.Electric_Motor_UV.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8L), - ItemList.Gravistar.get(4, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 4}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7L) - }, - new FluidStack[] {Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L), + ItemList.Electric_Motor_UV.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8L), + ItemList.Gravistar.get(4, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7L) }, + new FluidStack[] { Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304) }, ItemList.Emitter_UV.get(1), 600, 100000); @@ -375,18 +326,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Sensor_IV.get(1, new Object() {}), 144000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1L), - ItemList.Electric_Motor_LuV.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8L), - ItemList.QuantumStar.get(1, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Master), 4}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 576)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1L), + ItemList.Electric_Motor_LuV.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8L), + ItemList.QuantumStar.get(1, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 576) }, ItemList.Sensor_LuV.get(1), 600, 6000); @@ -394,18 +343,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Sensor_LuV.get(1, new Object() {}), 144000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1L), - ItemList.Electric_Motor_ZPM.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8L), - ItemList.QuantumStar.get(2, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 4}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 1152)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1L), + ItemList.Electric_Motor_ZPM.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8L), + ItemList.QuantumStar.get(2, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 1152) }, ItemList.Sensor_ZPM.get(1), 600, 24000); @@ -413,18 +360,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Sensor_ZPM.get(1, new Object() {}), 288000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L), - ItemList.Electric_Motor_UV.get(1, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8L), - ItemList.Gravistar.get(4, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 4}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7L) - }, - new FluidStack[] {Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L), + ItemList.Electric_Motor_UV.get(1, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8L), + ItemList.Gravistar.get(4, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7L) }, + new FluidStack[] { Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304) }, ItemList.Sensor_UV.get(1), 600, 100000); @@ -433,19 +378,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Field_Generator_IV.get(1, new Object() {}), 144000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6L), - ItemList.QuantumStar.get(2, new Object() {}), - ItemList.Emitter_LuV.get(4, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 4}, - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 8L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 576)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6L), + ItemList.QuantumStar.get(2, new Object() {}), ItemList.Emitter_LuV.get(4, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 8L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 576) }, ItemList.Field_Generator_LuV.get(1), 600, 6000); @@ -453,19 +395,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Field_Generator_LuV.get(1, new Object() {}), 144000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6L), - ItemList.QuantumStar.get(2, new Object() {}), - ItemList.Emitter_ZPM.get(4, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 4}, - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8L) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 1152)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6L), + ItemList.QuantumStar.get(2, new Object() {}), ItemList.Emitter_ZPM.get(4, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 4 }, + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 1152) }, ItemList.Field_Generator_ZPM.get(1), 600, 24000); @@ -473,21 +412,18 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Field_Generator_ZPM.get(1, new Object() {}), 288000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L), - ItemList.Gravistar.get(2, new Object() {}), - ItemList.Emitter_UV.get(4, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4}, - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8L) - }, - new FluidStack[] {Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L), + ItemList.Gravistar.get(2, new Object() {}), ItemList.Emitter_UV.get(4, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4 }, + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8L) }, + new FluidStack[] { Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304) }, ItemList.Field_Generator_UV.get(1), 600, 100000); @@ -496,27 +432,20 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Energy_IV.get(1, new Object() {}), 72000, - new Object[] { - ItemList.Hull_LuV.get(1L, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2L), - ItemList.Circuit_Chip_UHPIC.get(2L, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Master), 2}, - ItemList.LuV_Coil.get(2L, new Object() {}), - new ItemStack[] { - ItemList.Reactor_Coolant_He_3.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_3.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_1.get(1, new Object() {}) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_3.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_3.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_1.get(1, new Object() {}) - }, - ItemList.Electric_Pump_LuV.get(1L, new Object() {}) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), new FluidStack(solderIndalloy, 720) - }, + new Object[] { ItemList.Hull_LuV.get(1L, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2L), + ItemList.Circuit_Chip_UHPIC.get(2L, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, + ItemList.LuV_Coil.get(2L, new Object() {}), + new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_3.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_1.get(1, new Object() {}) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_3.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_1.get(1, new Object() {}) }, + ItemList.Electric_Pump_LuV.get(1L, new Object() {}) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + new FluidStack(solderIndalloy, 720) }, ItemList.Hatch_Energy_LuV.get(1), 400, (int) TierEU.RECIPE_LuV); @@ -524,27 +453,20 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Energy_LuV.get(1, new Object() {}), 144000, - new Object[] { - ItemList.Hull_ZPM.get(1L, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 2L), - ItemList.Circuit_Chip_NPIC.get(2L, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 2}, - ItemList.ZPM_Coil.get(2L, new Object() {}), - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - ItemList.Electric_Pump_ZPM.get(1L, new Object() {}) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), new FluidStack(solderIndalloy, 1440) - }, + new Object[] { ItemList.Hull_ZPM.get(1L, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 2L), + ItemList.Circuit_Chip_NPIC.get(2L, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, + ItemList.ZPM_Coil.get(2L, new Object() {}), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + ItemList.Electric_Pump_ZPM.get(1L, new Object() {}) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), + new FluidStack(solderIndalloy, 1440) }, ItemList.Hatch_Energy_ZPM.get(1), 600, (int) TierEU.ZPM); @@ -552,37 +474,26 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Energy_ZPM.get(1, new Object() {}), 288000, - new Object[] { - ItemList.Hull_UV.get(1L, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 2L), - ItemList.Circuit_Chip_PPIC.get(2L, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 2}, - ItemList.UV_Coil.get(2L, new Object() {}), - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - ItemList.Electric_Pump_UV.get(1L, new Object() {}) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000), new FluidStack(solderIndalloy, 2880) - }, + new Object[] { ItemList.Hull_UV.get(1L, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 2L), + ItemList.Circuit_Chip_PPIC.get(2L, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 2 }, + ItemList.UV_Coil.get(2L, new Object() {}), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + ItemList.Electric_Pump_UV.get(1L, new Object() {}) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000), + new FluidStack(solderIndalloy, 2880) }, ItemList.Hatch_Energy_UV.get(1), 800, 500000); @@ -591,30 +502,23 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Dynamo_IV.get(1, new Object() {}), 72000, - new Object[] { - ItemList.Hull_LuV.get(1L, new Object() {}), - GT_OreDictUnificator.get( - OrePrefixes.spring, - Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, - 2L), - ItemList.Circuit_Chip_UHPIC.get(2L, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Master), 2}, - ItemList.LuV_Coil.get(2L, new Object() {}), - new ItemStack[] { - ItemList.Reactor_Coolant_He_3.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_3.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_1.get(1, new Object() {}) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_3.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_3.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_1.get(1, new Object() {}) - }, - ItemList.Electric_Pump_LuV.get(1L, new Object() {}) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), new FluidStack(solderIndalloy, 720) - }, + new Object[] { ItemList.Hull_LuV.get(1L, new Object() {}), + GT_OreDictUnificator.get( + OrePrefixes.spring, + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, + 2L), + ItemList.Circuit_Chip_UHPIC.get(2L, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, + ItemList.LuV_Coil.get(2L, new Object() {}), + new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_3.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_1.get(1, new Object() {}) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_3.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_1.get(1, new Object() {}) }, + ItemList.Electric_Pump_LuV.get(1L, new Object() {}) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + new FluidStack(solderIndalloy, 720) }, ItemList.Hatch_Dynamo_LuV.get(1), 400, (int) TierEU.RECIPE_LuV); @@ -622,27 +526,21 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Dynamo_LuV.get(1, new Object() {}), 144000, - new Object[] { - ItemList.Hull_ZPM.get(1L, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 4L), - ItemList.Circuit_Chip_NPIC.get(2L, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 2}, - ItemList.ZPM_Coil.get(2L, new Object() {}), - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - ItemList.Electric_Pump_ZPM.get(1L, new Object() {}) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), new FluidStack(solderIndalloy, 1440) - }, + new Object[] { ItemList.Hull_ZPM.get(1L, new Object() {}), + GT_OreDictUnificator + .get(OrePrefixes.spring, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 4L), + ItemList.Circuit_Chip_NPIC.get(2L, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, + ItemList.ZPM_Coil.get(2L, new Object() {}), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + ItemList.Electric_Pump_ZPM.get(1L, new Object() {}) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), + new FluidStack(solderIndalloy, 1440) }, ItemList.Hatch_Dynamo_ZPM.get(1), 600, (int) TierEU.RECIPE_ZPM); @@ -650,37 +548,26 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Dynamo_ZPM.get(1, new Object() {}), 288000, - new Object[] { - ItemList.Hull_UV.get(1L, new Object() {}), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuvwire, 4L), - ItemList.Circuit_Chip_PPIC.get(2L, new Object() {}), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 2}, - ItemList.UV_Coil.get(2L, new Object() {}), - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), - ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) - }, - ItemList.Electric_Pump_UV.get(1L, new Object() {}) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000), new FluidStack(solderIndalloy, 2880) - }, + new Object[] { ItemList.Hull_UV.get(1L, new Object() {}), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuvwire, 4L), + ItemList.Circuit_Chip_PPIC.get(2L, new Object() {}), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 2 }, + ItemList.UV_Coil.get(2L, new Object() {}), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_NaK_6.get(1, new Object() {}), + ItemList.Reactor_Coolant_Sp_2.get(1, new Object() {}) }, + ItemList.Electric_Pump_UV.get(1L, new Object() {}) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000), + new FluidStack(solderIndalloy, 2880) }, ItemList.Hatch_Dynamo_UV.get(1), 800, 500000); @@ -688,22 +575,17 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Energy_LapotronicOrb2.get(1), 288000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 1}, - ItemList.Energy_LapotronicOrb2.get(8L), - ItemList.Field_Generator_LuV.get(2), - ItemList.Circuit_Wafer_SoC2.get(64), - ItemList.Circuit_Wafer_SoC2.get(64), - ItemList.Circuit_Parts_DiodeASMD.get(8), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32) - }, - new FluidStack[] { - new FluidStack(solderIndalloy, 2880), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + ItemList.Energy_LapotronicOrb2.get(8L), ItemList.Field_Generator_LuV.get(2), + ItemList.Circuit_Wafer_SoC2.get(64), ItemList.Circuit_Wafer_SoC2.get(64), + ItemList.Circuit_Parts_DiodeASMD.get(8), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32) }, + new FluidStack[] { new FluidStack(solderIndalloy, 2880), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) }, ItemList.Energy_Module.get(1), 2000, 100000); @@ -711,22 +593,17 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Energy_Module.get(1), 288000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32L), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1}, - ItemList.Energy_Module.get(8L), - ItemList.Field_Generator_ZPM.get(2), - ItemList.Circuit_Wafer_HPIC.get(64), - ItemList.Circuit_Wafer_HPIC.get(64), - ItemList.Circuit_Parts_DiodeASMD.get(16), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32), - }, - new FluidStack[] { - new FluidStack(solderIndalloy, 2880), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32L), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 1 }, + ItemList.Energy_Module.get(8L), ItemList.Field_Generator_ZPM.get(2), + ItemList.Circuit_Wafer_HPIC.get(64), ItemList.Circuit_Wafer_HPIC.get(64), + ItemList.Circuit_Parts_DiodeASMD.get(16), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32), }, + new FluidStack[] { new FluidStack(solderIndalloy, 2880), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) }, ItemList.Energy_Cluster.get(1), 2000, 200000); @@ -734,21 +611,16 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 1), 144000, - new Object[] { - ItemList.Casing_Fusion_Coil.get(1), - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 1}, - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 4L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 4L), - ItemList.Field_Generator_LuV.get(2), - ItemList.Circuit_Wafer_UHPIC.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 32), - }, - new FluidStack[] { - new FluidStack(solderIndalloy, 2880), Materials.VanadiumGallium.getMolten(1152L), - }, + new Object[] { ItemList.Casing_Fusion_Coil.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 4L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 4L), + ItemList.Field_Generator_LuV.get(2), ItemList.Circuit_Wafer_UHPIC.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 32), }, + new FluidStack[] { new FluidStack(solderIndalloy, 2880), Materials.VanadiumGallium.getMolten(1152L), }, ItemList.FusionComputer_LuV.get(1), 1000, 30000); @@ -756,20 +628,15 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Europium, 1), 288000, - new Object[] { - ItemList.Casing_Fusion_Coil.get(1), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1}, - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 4L), - ItemList.Field_Generator_ZPM.get(2), - ItemList.Circuit_Wafer_PPIC.get(48), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 32), - }, - new FluidStack[] { - new FluidStack(solderIndalloy, 2880), Materials.NiobiumTitanium.getMolten(1152L), - }, + new Object[] { ItemList.Casing_Fusion_Coil.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 1 }, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 4L), + ItemList.Field_Generator_ZPM.get(2), ItemList.Circuit_Wafer_PPIC.get(48), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 32), }, + new FluidStack[] { new FluidStack(solderIndalloy, 2880), Materials.NiobiumTitanium.getMolten(1152L), }, ItemList.FusionComputer_ZPMV.get(1), 1000, 60000); @@ -777,20 +644,15 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Americium, 1), 432000, - new Object[] { - ItemList.Casing_Fusion_Coil.get(1), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1}, - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4L), - ItemList.Field_Generator_UV.get(2), - ItemList.Circuit_Wafer_QPIC.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 32), - }, - new FluidStack[] { - new FluidStack(solderIndalloy, 2880), Materials.ElectrumFlux.getMolten(1152L), - }, + new Object[] { ItemList.Casing_Fusion_Coil.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4L), + ItemList.Field_Generator_UV.get(2), ItemList.Circuit_Wafer_QPIC.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 32), }, + new FluidStack[] { new FluidStack(solderIndalloy, 2880), Materials.ElectrumFlux.getMolten(1152L), }, ItemList.FusionComputer_UV.get(1), 1000, 90000); @@ -798,26 +660,18 @@ public class AssemblyLineRecipes implements Runnable { GT_Values.RA.addAssemblylineRecipe( ItemList.Machine_IV_OreWasher.get(1), 432000, - new Object[] { - ItemList.Hull_MAX.get(1L), - ItemList.Electric_Motor_UHV.get(32L), - ItemList.Electric_Piston_UHV.get(8L), - ItemList.Electric_Pump_UHV.get(16L), - ItemList.Conveyor_Module_UHV.get(8L), - ItemList.Robot_Arm_UHV.get(8L), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4}, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Duranium, 32), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 32) - }, - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 64), - new ItemStack[] { - ItemList.Component_Grinder_Tungsten.get(4L), ItemList.Component_Grinder_Diamond.get(64L) - }, - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 32), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Chrome, 16) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 2880), Materials.Naquadria.getMolten(1440)}, + new Object[] { ItemList.Hull_MAX.get(1L), ItemList.Electric_Motor_UHV.get(32L), + ItemList.Electric_Piston_UHV.get(8L), ItemList.Electric_Pump_UHV.get(16L), + ItemList.Conveyor_Module_UHV.get(8L), ItemList.Robot_Arm_UHV.get(8L), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4 }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Duranium, 32), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 32) }, + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 64), + new ItemStack[] { ItemList.Component_Grinder_Tungsten.get(4L), + ItemList.Component_Grinder_Diamond.get(64L) }, + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 32), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Chrome, 16) }, + new FluidStack[] { new FluidStack(solderIndalloy, 2880), Materials.Naquadria.getMolten(1440) }, ItemList.Ore_Processor.get(1), 1200, 900000); diff --git a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java index 6c44e6d51a..1ef911c448 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java @@ -2,14 +2,16 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.util.GT_ModHandler.getModItem; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.item.ItemStack; public class AutoclaveRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addAutoclaveRecipe( @@ -168,8 +170,9 @@ public class AutoclaveRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1), Materials.Water.getFluid(1000L), GT_Values.NF, - new ItemStack[] {GT_Values.NI, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)}, - new int[] {0, 7500}, + new ItemStack[] { GT_Values.NI, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3) }, + new int[] { 0, 7500 }, 1200, (int) TierEU.RECIPE_LV, false); @@ -178,8 +181,9 @@ public class AutoclaveRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getDistilledWater(1000L), GT_Values.NF, - new ItemStack[] {GT_Values.NI, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)}, - new int[] {0, 9000}, + new ItemStack[] { GT_Values.NI, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3) }, + new int[] { 0, 9000 }, 1200, (int) TierEU.RECIPE_LV, false); diff --git a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java index 2ccdd50362..614632bb42 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java @@ -1,13 +1,15 @@ package gregtech.loaders.postload.recipes; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class BenderRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addBenderRecipe( @@ -175,7 +177,10 @@ public class BenderRecipes implements Runnable { // cell, bucket, food can GT_Values.RA.addBenderRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 12L), ItemList.Cell_Empty.get(6L), 1200, 8); + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 12L), + ItemList.Cell_Empty.get(6L), + 1200, + 8); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 12L), ItemList.Cell_Empty.get(12L), diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index 3ca6d6408d..0d7d761880 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -4,15 +4,17 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isGTNHLanthanidLoaded; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isGTPPLoaded; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import gregtech.GT_Mod; import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class BlastFurnaceRecipes implements Runnable { + @Override public void run() { @@ -536,12 +538,8 @@ public class BlastFurnaceRecipes implements Runnable { (int) TierEU.RECIPE_HV, 1688); - ItemStack[] tSiliconDioxide = new ItemStack[] { - Materials.SiliconDioxide.getDust(3), - Materials.NetherQuartz.getDust(3), - Materials.CertusQuartz.getDust(3), - Materials.Quartzite.getDust(6) - }; + ItemStack[] tSiliconDioxide = new ItemStack[] { Materials.SiliconDioxide.getDust(3), + Materials.NetherQuartz.getDust(3), Materials.CertusQuartz.getDust(3), Materials.Quartzite.getDust(6) }; // Roasting @@ -664,12 +662,32 @@ public class BlastFurnaceRecipes implements Runnable { public void primitiveBlastFurnaceRecipes() { GT_Values.RA.addPrimitiveBlastRecipe( - Materials.Iron.getIngots(1), GT_Values.NI, 4, Materials.Steel.getIngots(1), GT_Values.NI, 7200); + Materials.Iron.getIngots(1), + GT_Values.NI, + 4, + Materials.Steel.getIngots(1), + GT_Values.NI, + 7200); GT_Values.RA.addPrimitiveBlastRecipe( - Materials.Iron.getDust(1), GT_Values.NI, 4, Materials.Steel.getIngots(1), GT_Values.NI, 7200); + Materials.Iron.getDust(1), + GT_Values.NI, + 4, + Materials.Steel.getIngots(1), + GT_Values.NI, + 7200); GT_Values.RA.addPrimitiveBlastRecipe( - Materials.Iron.getBlocks(1), GT_Values.NI, 36, Materials.Steel.getIngots(9), GT_Values.NI, 64800); + Materials.Iron.getBlocks(1), + GT_Values.NI, + 36, + Materials.Steel.getIngots(9), + GT_Values.NI, + 64800); GT_Values.RA.addPrimitiveBlastRecipe( - Materials.Steel.getDust(1), GT_Values.NI, 2, Materials.Steel.getIngots(1), GT_Values.NI, 7200); + Materials.Steel.getDust(1), + GT_Values.NI, + 2, + Materials.Steel.getIngots(1), + GT_Values.NI, + 7200); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java index ed9f8de513..338061f926 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java @@ -3,17 +3,19 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.util.GT_ModHandler.getModItem; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; -import gregtech.api.enums.*; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.loaders.postload.GT_MachineRecipeLoader; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import gregtech.api.enums.*; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.loaders.postload.GT_MachineRecipeLoader; + public class BreweryRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addBrewingRecipe( @@ -46,9 +48,7 @@ public class BreweryRecipes implements Runnable { FluidRegistry.getFluid("seedoil"), FluidRegistry.getFluid("lubricant"), false); - for (Fluid tFluid : new Fluid[] { - FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L).getFluid() - }) { + for (Fluid tFluid : new Fluid[] { FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L).getFluid() }) { GT_Values.RA.addBrewingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L), tFluid, @@ -100,30 +100,60 @@ public class BreweryRecipes implements Runnable { FluidRegistry.getFluid("potion.mundane"), false); GT_Values.RA.addBrewingRecipe( - new ItemStack(Items.magma_cream, 1, 0), tFluid, FluidRegistry.getFluid("potion.mundane"), false); + new ItemStack(Items.magma_cream, 1, 0), + tFluid, + FluidRegistry.getFluid("potion.mundane"), + false); GT_Values.RA.addBrewingRecipe( new ItemStack(Items.fermented_spider_eye, 1, 0), tFluid, FluidRegistry.getFluid("potion.mundane"), false); GT_Values.RA.addBrewingRecipe( - new ItemStack(Items.spider_eye, 1, 0), tFluid, FluidRegistry.getFluid("potion.mundane"), false); + new ItemStack(Items.spider_eye, 1, 0), + tFluid, + FluidRegistry.getFluid("potion.mundane"), + false); GT_Values.RA.addBrewingRecipe( - new ItemStack(Items.speckled_melon, 1, 0), tFluid, FluidRegistry.getFluid("potion.mundane"), false); + new ItemStack(Items.speckled_melon, 1, 0), + tFluid, + FluidRegistry.getFluid("potion.mundane"), + false); GT_Values.RA.addBrewingRecipe( - new ItemStack(Items.ghast_tear, 1, 0), tFluid, FluidRegistry.getFluid("potion.mundane"), false); + new ItemStack(Items.ghast_tear, 1, 0), + tFluid, + FluidRegistry.getFluid("potion.mundane"), + false); GT_Values.RA.addBrewingRecipe( - new ItemStack(Items.nether_wart, 1, 0), tFluid, FluidRegistry.getFluid("potion.awkward"), false); + new ItemStack(Items.nether_wart, 1, 0), + tFluid, + FluidRegistry.getFluid("potion.awkward"), + false); GT_Values.RA.addBrewingRecipe( - new ItemStack(Blocks.red_mushroom, 1, 0), tFluid, FluidRegistry.getFluid("potion.poison"), false); + new ItemStack(Blocks.red_mushroom, 1, 0), + tFluid, + FluidRegistry.getFluid("potion.poison"), + false); GT_Values.RA.addBrewingRecipe( - new ItemStack(Items.fish, 1, 3), tFluid, FluidRegistry.getFluid("potion.poison.strong"), true); + new ItemStack(Items.fish, 1, 3), + tFluid, + FluidRegistry.getFluid("potion.poison.strong"), + true); GT_Values.RA.addBrewingRecipe( - ItemList.IC2_Grin_Powder.get(1L), tFluid, FluidRegistry.getFluid("potion.poison.strong"), false); + ItemList.IC2_Grin_Powder.get(1L), + tFluid, + FluidRegistry.getFluid("potion.poison.strong"), + false); GT_Values.RA.addBrewingRecipe( - new ItemStack(Items.reeds, 1, 0), tFluid, FluidRegistry.getFluid("potion.reedwater"), false); + new ItemStack(Items.reeds, 1, 0), + tFluid, + FluidRegistry.getFluid("potion.reedwater"), + false); GT_Values.RA.addBrewingRecipe( - new ItemStack(Items.apple, 1, 0), tFluid, FluidRegistry.getFluid("potion.applejuice"), false); + new ItemStack(Items.apple, 1, 0), + tFluid, + FluidRegistry.getFluid("potion.applejuice"), + false); GT_Values.RA.addBrewingRecipe( new ItemStack(Items.golden_apple, 1, 0), tFluid, @@ -135,7 +165,10 @@ public class BreweryRecipes implements Runnable { FluidRegistry.getFluid("potion.idunsapplejuice"), true); GT_Values.RA.addBrewingRecipe( - ItemList.IC2_Hops.get(1L), tFluid, FluidRegistry.getFluid("potion.hopsjuice"), false); + ItemList.IC2_Hops.get(1L), + tFluid, + FluidRegistry.getFluid("potion.hopsjuice"), + false); GT_Values.RA.addBrewingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L), tFluid, @@ -367,7 +400,10 @@ public class BreweryRecipes implements Runnable { public void addPotionRecipes(String aName, ItemStack aItem) { // normal GT_Values.RA.addBrewingRecipe( - aItem, FluidRegistry.getFluid("potion.awkward"), FluidRegistry.getFluid("potion." + aName), false); + aItem, + FluidRegistry.getFluid("potion.awkward"), + FluidRegistry.getFluid("potion." + aName), + false); // strong GT_Values.RA.addBrewingRecipe( aItem, diff --git a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java index 42fdc1f852..1971fd6a6b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java @@ -8,6 +8,7 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; public class CannerRecipes implements Runnable { + @Override public void run() { // fuel rod canner recipes diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java index ca2f9f4b36..61db0d4cae 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java @@ -6,16 +6,18 @@ import static gregtech.loaders.postload.GT_MachineRecipeLoader.isExtraUtilitiesL import static gregtech.loaders.postload.GT_MachineRecipeLoader.isThaumcraftLoaded; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class CentrifugeRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addCentrifugeRecipe( @@ -29,7 +31,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {10000, 10000, 9000}, + new int[] { 10000, 10000, 9000 }, 400, (int) TierEU.RECIPE_MV); @@ -59,7 +61,7 @@ public class CentrifugeRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 3), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 3), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 3), - new int[] {10000, 10000, 10000, 9500, 9000, 8500}, + new int[] { 10000, 10000, 10000, 9500, 9000, 8500 }, 8100, 30); @@ -74,7 +76,7 @@ public class CentrifugeRecipes implements Runnable { Materials.Tin.getDust(1), Materials.Nickel.getDust(1), Materials.Antimony.getDust(1), - new int[] {10000, 4000, 2000, 2000, 2000, 2000}, + new int[] { 10000, 4000, 2000, 2000, 2000, 2000 }, 40, (int) TierEU.RECIPE_MV); @@ -596,7 +598,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {5000, 100, 5000}, + new int[] { 5000, 100, 5000 }, 600, (int) TierEU.RECIPE_MV); GT_Values.RA.addCentrifugeRecipe( @@ -610,7 +612,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {1250, 5000, 5000}, + new int[] { 1250, 5000, 5000 }, 250, 30); GT_Values.RA.addCentrifugeRecipe( @@ -624,7 +626,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {2500, 5000, 5000}, + new int[] { 2500, 5000, 5000 }, 250, 30); GT_Values.RA.addCentrifugeRecipe( @@ -638,7 +640,7 @@ public class CentrifugeRecipes implements Runnable { new ItemStack(Blocks.sand, 1), GT_Values.NI, GT_Values.NI, - new int[] {2500, 2500, 5000, 5000}, + new int[] { 2500, 2500, 5000, 5000 }, 650, 30); GT_Values.RA.addCentrifugeRecipe( @@ -652,7 +654,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {10000, 1000}, + new int[] { 10000, 1000 }, 300, 5); GT_Values.RA.addCentrifugeRecipe( @@ -686,7 +688,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {2000, 200}, + new int[] { 2000, 200 }, 800, 320); GT_Values.RA.addCentrifugeRecipe( @@ -700,7 +702,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {2000, 3000}, + new int[] { 2000, 3000 }, 1600, 320); GT_Values.RA.addCentrifugeRecipe( @@ -714,7 +716,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {5000, 1000}, + new int[] { 5000, 1000 }, 28800, 320); GT_Values.RA.addCentrifugeRecipe( @@ -728,7 +730,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {2000, 3000}, + new int[] { 2000, 3000 }, 25600, 640); GT_Values.RA.addCentrifugeRecipe( @@ -799,7 +801,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {3750, 2500, 9000, 0, 0, 0}, + new int[] { 3750, 2500, 9000, 0, 0, 0 }, 11520, 20); GT_Values.RA.addCentrifugeRecipe( @@ -813,7 +815,7 @@ public class CentrifugeRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L), GT_Values.NI, GT_Values.NI, - new int[] {5625, 9900, 5625, 2500, 0, 0}, + new int[] { 5625, 9900, 5625, 2500, 0, 0 }, 5760, 20); @@ -828,7 +830,7 @@ public class CentrifugeRecipes implements Runnable { Materials.Gold.getNuggets(4), Materials.Sapphire.getDust(1), Materials.Tantalite.getDust(1), - new int[] {5000, 1000, 1000, 250, 1250, 500}, + new int[] { 5000, 1000, 1000, 250, 1250, 500 }, 320, 80); GT_Values.RA.addCentrifugeRecipe( @@ -842,7 +844,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {1000, 700, 9000, 0, 0, 0}, + new int[] { 1000, 700, 9000, 0, 0, 0 }, 200, 12); @@ -857,7 +859,7 @@ public class CentrifugeRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Scheelite, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Bauxite, 1L), - new int[] {2000, 1000, 250, 50, 250, 500}, + new int[] { 2000, 1000, 250, 50, 250, 500 }, 40, 1024); GT_Values.RA.addCentrifugeRecipe( @@ -871,7 +873,7 @@ public class CentrifugeRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Scheelite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 9L), - new int[] {2000, 4000, 1000, 200, 2250, 4500}, + new int[] { 2000, 4000, 1000, 200, 2250, 4500 }, 328, 4096); @@ -887,7 +889,7 @@ public class CentrifugeRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cerium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cadmium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Caesium, 1L), - new int[] {2500, 2500, 2500, 2500, 2500, 2500}, + new int[] { 2500, 2500, 2500, 2500, 2500, 2500 }, 64, 20); @@ -902,7 +904,7 @@ public class CentrifugeRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Flint, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.RareEarth, 1L), - new int[] {2000, 2000, 2000, 2000, 2000, 2000}, + new int[] { 2000, 2000, 2000, 2000, 2000, 2000 }, 64, 20); GT_Values.RA.addCentrifugeRecipe( @@ -916,7 +918,7 @@ public class CentrifugeRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Basalt, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Flint, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 2L), - new int[] {9000, 9000, 9000, 9000, 9000, 9000}, + new int[] { 9000, 9000, 9000, 9000, 9000, 9000 }, 518, 80); @@ -932,7 +934,7 @@ public class CentrifugeRecipes implements Runnable { Materials.PhosphorousPentoxide.getDust(2), Materials.SodaAsh.getDust(1), Materials.BandedIron.getDust(4), - new int[] {6400, 6000, 4500, 10000, 10000, 10000}, + new int[] { 6400, 6000, 4500, 10000, 10000, 10000 }, 6000, 30); // Stone Dust and Metal Mixture centrifuge recipes @@ -947,7 +949,7 @@ public class CentrifugeRecipes implements Runnable { Materials.Biotite.getDust(4), Materials.MetalMixture.getDust(3), Materials.Sodalite.getDust(2), - new int[] {10000, 10000, 10000, 10000, 10000, 10000}, + new int[] { 10000, 10000, 10000, 10000, 10000, 10000 }, 8640, 30); GT_Values.RA.addCentrifugeRecipe( @@ -961,7 +963,7 @@ public class CentrifugeRecipes implements Runnable { Materials.Barite.getDust(4), Materials.Chromite.getDust(3), Materials.Ilmenite.getDust(2), - new int[] {10000, 10000, 10000, 10000, 10000, 10000}, + new int[] { 10000, 10000, 10000, 10000, 10000, 10000 }, 13125, (int) TierEU.RECIPE_EV); @@ -1005,7 +1007,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {10000, 10000}, + new int[] { 10000, 10000 }, 600, 2000000); diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java index 7d11e4c315..5e33922990 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java @@ -3,15 +3,17 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.GT_Values.MOD_ID_RC; import static gregtech.api.util.GT_ModHandler.getModItem; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ChemicalBathRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addChemicalBathRecipe( @@ -761,7 +763,7 @@ public class ChemicalBathRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Tantalite, 1), Materials.Tantalum.getDust(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 3000, 4000}, + new int[] { 10000, 3000, 4000 }, 800, 8); GT_Values.RA.addChemicalBathRecipe( @@ -770,7 +772,7 @@ public class ChemicalBathRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pyrolusite, 1), Materials.Manganese.getDust(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 7000, 4000}, + new int[] { 10000, 7000, 4000 }, 800, 8); GT_Values.RA.addChemicalBathRecipe( @@ -779,7 +781,7 @@ public class ChemicalBathRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Quartzite, 1), Materials.CertusQuartz.getDust(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 3000, 4000}, + new int[] { 10000, 3000, 4000 }, 800, 8); GT_Values.RA.addChemicalBathRecipe( @@ -788,7 +790,7 @@ public class ChemicalBathRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.CertusQuartz, 1), Materials.Barium.getDust(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 7000, 4000}, + new int[] { 10000, 7000, 4000 }, 800, 8); GT_Values.RA.addChemicalBathRecipe( @@ -797,7 +799,7 @@ public class ChemicalBathRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Bauxite, 1), Materials.Rutile.getDust(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 5000, 4000}, + new int[] { 10000, 5000, 4000 }, 800, 8); GT_Values.RA.addChemicalBathRecipe( @@ -806,7 +808,7 @@ public class ChemicalBathRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Thorium, 1), Materials.Uranium.getDust(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 3000, 4000}, + new int[] { 10000, 3000, 4000 }, 800, 8); GT_Values.RA.addChemicalBathRecipe( @@ -815,7 +817,7 @@ public class ChemicalBathRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Stibnite, 1), Materials.Antimony.getDust(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 5000, 4000}, + new int[] { 10000, 5000, 4000 }, 800, 8); diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index 4ae3797f97..80e003d26d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -5,10 +5,6 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.*; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; -import gregtech.api.enums.*; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -16,6 +12,11 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.enums.*; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; + public class ChemicalRecipes implements Runnable { @Override @@ -238,9 +239,7 @@ public class ChemicalRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1), 5760); - for (Fluid tFluid : new Fluid[] { - FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L).getFluid() - }) { + for (Fluid tFluid : new Fluid[] { FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L).getFluid() }) { GT_Values.RA.addChemicalRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), @@ -525,9 +524,9 @@ public class ChemicalRecipes implements Runnable { 5, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(22)}, - new FluidStack[] {Materials.Hydrogen.getGas(16000), Materials.Oxygen.getGas(8000)}, - new FluidStack[] {GT_ModHandler.getDistilledWater(8000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(22) }, + new FluidStack[] { Materials.Hydrogen.getGas(16000), Materials.Oxygen.getGas(8000) }, + new FluidStack[] { GT_ModHandler.getDistilledWater(8000) }, new ItemStack[] {}, 80, 30); @@ -829,7 +828,10 @@ public class ChemicalRecipes implements Runnable { // 2Na + S = Na2S GT_Values.RA.addChemicalRecipe( - Materials.Sodium.getDust(2), Materials.Sulfur.getDust(1), Materials.SodiumSulfide.getDust(3), 60); + Materials.Sodium.getDust(2), + Materials.Sulfur.getDust(1), + Materials.SodiumSulfide.getDust(3), + 60); // H2S + H2O + (O2) = 0.5H2SO4(Diluted) ( S loss GT_Values.RA.addChemicalRecipe( Materials.HydricSulfide.getCells(1), @@ -3441,10 +3443,14 @@ public class ChemicalRecipes implements Runnable { public void polymerizationRecipes() { GT_Values.RA.addDefaultPolymerizationRecipes( - Materials.VinylAcetate.mFluid, Materials.VinylAcetate.getCells(1), Materials.PolyvinylAcetate.mFluid); + Materials.VinylAcetate.mFluid, + Materials.VinylAcetate.getCells(1), + Materials.PolyvinylAcetate.mFluid); GT_Values.RA.addDefaultPolymerizationRecipes( - Materials.Ethylene.mGas, Materials.Ethylene.getCells(1), Materials.Plastic.mStandardMoltenFluid); + Materials.Ethylene.mGas, + Materials.Ethylene.getCells(1), + Materials.Plastic.mStandardMoltenFluid); GT_Values.RA.addDefaultPolymerizationRecipes( Materials.Tetrafluoroethylene.mGas, @@ -3457,7 +3463,9 @@ public class ChemicalRecipes implements Runnable { Materials.PolyvinylChloride.mStandardMoltenFluid); GT_Values.RA.addDefaultPolymerizationRecipes( - Materials.Styrene.mFluid, Materials.Styrene.getCells(1), Materials.Polystyrene.mStandardMoltenFluid); + Materials.Styrene.mFluid, + Materials.Styrene.getCells(1), + Materials.Polystyrene.mStandardMoltenFluid); } public void singleBlockOnly() { @@ -3853,482 +3861,374 @@ public class ChemicalRecipes implements Runnable { public void multiblockOnly() { GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.PotassiumNitrade.getDust(10), Materials.ChromiumTrioxide.getDust(8)}, + new ItemStack[] { Materials.PotassiumNitrade.getDust(10), Materials.ChromiumTrioxide.getDust(8) }, null, - new FluidStack[] {Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000)}, - new ItemStack[] {Materials.Potassiumdichromate.getDust(11)}, + new FluidStack[] { Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000) }, + new ItemStack[] { Materials.Potassiumdichromate.getDust(11) }, 100, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.Saltpeter.getDust(10), Materials.ChromiumTrioxide.getDust(8)}, + new ItemStack[] { Materials.Saltpeter.getDust(10), Materials.ChromiumTrioxide.getDust(8) }, null, - new FluidStack[] {Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000)}, - new ItemStack[] {Materials.Potassiumdichromate.getDust(11)}, + new FluidStack[] { Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000) }, + new ItemStack[] { Materials.Potassiumdichromate.getDust(11) }, 100, 480); // Potassium Dichromate shortcut // 2 Cr + 6O + 10 Saltpeter/Potassium Dichromate = 10 K2Cr2O7 + 2NO + 3O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - Materials.PotassiumNitrade.getDust(64), - Materials.PotassiumNitrade.getDust(64), - Materials.PotassiumNitrade.getDust(32), - Materials.Chrome.getDust(2 * 16), - GT_Utility.getIntegratedCircuit(11) - }, - new FluidStack[] {Materials.Oxygen.getGas(6000 * 16)}, - new FluidStack[] {Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16)}, - new ItemStack[] { - Materials.Potassiumdichromate.getDust(64), - Materials.Potassiumdichromate.getDust(64), - Materials.Potassiumdichromate.getDust(48) - }, + new ItemStack[] { Materials.PotassiumNitrade.getDust(64), Materials.PotassiumNitrade.getDust(64), + Materials.PotassiumNitrade.getDust(32), Materials.Chrome.getDust(2 * 16), + GT_Utility.getIntegratedCircuit(11) }, + new FluidStack[] { Materials.Oxygen.getGas(6000 * 16) }, + new FluidStack[] { Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16) }, + new ItemStack[] { Materials.Potassiumdichromate.getDust(64), Materials.Potassiumdichromate.getDust(64), + Materials.Potassiumdichromate.getDust(48) }, 2560, (int) GT_Values.VP[7]); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - Materials.Saltpeter.getDust(64), - Materials.Saltpeter.getDust(64), - Materials.Saltpeter.getDust(32), - Materials.Chrome.getDust(2 * 16), - GT_Utility.getIntegratedCircuit(11) - }, - new FluidStack[] {Materials.Oxygen.getGas(6000 * 16)}, - new FluidStack[] {Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16)}, - new ItemStack[] { - Materials.Potassiumdichromate.getDust(64), - Materials.Potassiumdichromate.getDust(64), - Materials.Potassiumdichromate.getDust(48) - }, + new ItemStack[] { Materials.Saltpeter.getDust(64), Materials.Saltpeter.getDust(64), + Materials.Saltpeter.getDust(32), Materials.Chrome.getDust(2 * 16), + GT_Utility.getIntegratedCircuit(11) }, + new FluidStack[] { Materials.Oxygen.getGas(6000 * 16) }, + new FluidStack[] { Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16) }, + new ItemStack[] { Materials.Potassiumdichromate.getDust(64), Materials.Potassiumdichromate.getDust(64), + Materials.Potassiumdichromate.getDust(48) }, 2560, (int) GT_Values.VP[7]); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] {Materials.Benzene.getFluid(1000L), Materials.Methane.getGas(2000L)}, - new FluidStack[] {Materials.Dimethylbenzene.getFluid(1000L), Materials.Hydrogen.getGas(4000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.Benzene.getFluid(1000L), Materials.Methane.getGas(2000L) }, + new FluidStack[] { Materials.Dimethylbenzene.getFluid(1000L), Materials.Hydrogen.getGas(4000L) }, null, 4000, 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 27), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 9) - }, - new FluidStack[] {Materials.SulfuricAcid.getFluid(36000)}, - new FluidStack[] {new FluidStack(ItemList.sIndiumConcentrate, 72000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(8), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 27), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 9) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(36000) }, + new FluidStack[] { new FluidStack(ItemList.sIndiumConcentrate, 72000) }, null, 160, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 9) - }, - new FluidStack[] {Materials.SulfuricAcid.getFluid(9000L)}, - new FluidStack[] {new FluidStack(ItemList.sNickelSulfate, 18000)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 9) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(9000L) }, + new FluidStack[] { new FluidStack(ItemList.sNickelSulfate, 18000) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1) }, 25, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 9) - }, - new FluidStack[] {Materials.SulfuricAcid.getFluid(9000L)}, - new FluidStack[] {new FluidStack(ItemList.sBlueVitriol, 18000)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 9) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(9000L) }, + new FluidStack[] { new FluidStack(ItemList.sBlueVitriol, 18000) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1) }, 25, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1L), - GT_Utility.getIntegratedCircuit(8) - }, - new FluidStack[] {Materials.Air.getGas(8000L)}, - new FluidStack[] {Materials.Radon.getGas(800L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 64L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1L), + GT_Utility.getIntegratedCircuit(8) }, + new FluidStack[] { Materials.Air.getGas(8000L) }, + new FluidStack[] { Materials.Radon.getGas(800L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 64L) }, 1500, 480); // 3SiO2 + 4Al = 3Si + 2Al2O3 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4) }, null, null, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10) }, 10, 120); // 10Si + 30HCl -> 0.3 SiH2Cl2 + 9 HSiCl3 + 0.3 SiCl4 + 0.2 Si2Cl6 + 20.4H GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 10) - }, - new FluidStack[] {Materials.HydrochloricAcid.getFluid(30000)}, - new FluidStack[] { - Materials.Trichlorosilane.getFluid(9000), - Materials.SiliconTetrachloride.getFluid(300), - Materials.Hexachlorodisilane.getFluid(200), - Materials.Dichlorosilane.getGas(300), - Materials.Hydrogen.getGas(20400) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 10) }, + new FluidStack[] { Materials.HydrochloricAcid.getFluid(30000) }, + new FluidStack[] { Materials.Trichlorosilane.getFluid(9000), + Materials.SiliconTetrachloride.getFluid(300), Materials.Hexachlorodisilane.getFluid(200), + Materials.Dichlorosilane.getGas(300), Materials.Hydrogen.getGas(20400) }, null, 150, 480); // 2CO + 2C3H6 + 4H =RhHCO(P(C6H5)3)3= C4H8O + C4H8O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(4), MaterialsKevlar.OrganorhodiumCatalyst.getDustTiny(1) - }, - new FluidStack[] { - Materials.Hydrogen.getGas(4000), - Materials.Propene.getGas(2000), - Materials.CarbonMonoxide.getGas(2000) - }, - new FluidStack[] { - MaterialsKevlar.Butyraldehyde.getFluid(1000), MaterialsKevlar.Isobutyraldehyde.getFluid(1000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(4), + MaterialsKevlar.OrganorhodiumCatalyst.getDustTiny(1) }, + new FluidStack[] { Materials.Hydrogen.getGas(4000), Materials.Propene.getGas(2000), + Materials.CarbonMonoxide.getGas(2000) }, + new FluidStack[] { MaterialsKevlar.Butyraldehyde.getFluid(1000), + MaterialsKevlar.Isobutyraldehyde.getFluid(1000) }, null, 300, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.OrganorhodiumCatalyst.getDust(1)}, - new FluidStack[] { - Materials.Hydrogen.getGas(36000), - Materials.Propene.getGas(18000), - Materials.CarbonMonoxide.getGas(18000) - }, - new FluidStack[] { - MaterialsKevlar.Butyraldehyde.getFluid(9000), MaterialsKevlar.Isobutyraldehyde.getFluid(9000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + MaterialsKevlar.OrganorhodiumCatalyst.getDust(1) }, + new FluidStack[] { Materials.Hydrogen.getGas(36000), Materials.Propene.getGas(18000), + Materials.CarbonMonoxide.getGas(18000) }, + new FluidStack[] { MaterialsKevlar.Butyraldehyde.getFluid(9000), + MaterialsKevlar.Isobutyraldehyde.getFluid(9000) }, null, 2000, 30); // C2H4 + O =Al2O3,Ag= C2H4O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1L) - }, - new FluidStack[] {Materials.Ethylene.getGas(1000), Materials.Oxygen.getGas(1000)}, - new FluidStack[] {MaterialsKevlar.EthyleneOxide.getGas(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1L) }, + new FluidStack[] { Materials.Ethylene.getGas(1000), Materials.Oxygen.getGas(1000) }, + new FluidStack[] { MaterialsKevlar.EthyleneOxide.getGas(1000) }, null, 50, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 9L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L) - }, - new FluidStack[] {Materials.Ethylene.getGas(9000), Materials.Oxygen.getGas(9000)}, - new FluidStack[] {MaterialsKevlar.EthyleneOxide.getGas(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 9L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L) }, + new FluidStack[] { Materials.Ethylene.getGas(9000), Materials.Oxygen.getGas(9000) }, + new FluidStack[] { MaterialsKevlar.EthyleneOxide.getGas(9000) }, null, 400, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] { - MaterialsKevlar.EthyleneOxide.getGas(1000), - Materials.Dimethyldichlorosilane.getFluid(4000), - Materials.Water.getFluid(5000) - }, - new FluidStack[] {MaterialsKevlar.SiliconOil.getFluid(5000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { MaterialsKevlar.EthyleneOxide.getGas(1000), + Materials.Dimethyldichlorosilane.getFluid(4000), Materials.Water.getFluid(5000) }, + new FluidStack[] { MaterialsKevlar.SiliconOil.getFluid(5000) }, null, 15, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(8)}, - new FluidStack[] { - MaterialsKevlar.EthyleneOxide.getGas(9000), - Materials.Dimethyldichlorosilane.getFluid(36000), - Materials.Water.getFluid(45000) - }, - new FluidStack[] {MaterialsKevlar.SiliconOil.getFluid(45000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(8) }, + new FluidStack[] { MaterialsKevlar.EthyleneOxide.getGas(9000), + Materials.Dimethyldichlorosilane.getFluid(36000), Materials.Water.getFluid(45000) }, + new FluidStack[] { MaterialsKevlar.SiliconOil.getFluid(45000) }, null, 100, 1920); // NH3 + CH4O =SiO2,Al2O3= CH5N + H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L) - }, - new FluidStack[] {Materials.Methanol.getFluid(1000), Materials.Ammonia.getGas(1000)}, - new FluidStack[] {MaterialsKevlar.Methylamine.getGas(1000L), Materials.Water.getFluid(1000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(10), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L) }, + new FluidStack[] { Materials.Methanol.getFluid(1000), Materials.Ammonia.getGas(1000) }, + new FluidStack[] { MaterialsKevlar.Methylamine.getGas(1000L), Materials.Water.getFluid(1000L) }, null, 1500, 500000); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 5L) - }, - new FluidStack[] { - MaterialsKevlar.Ethyleneglycol.getFluid(4000), MaterialsKevlar.SiliconOil.getFluid(1000) - }, - new FluidStack[] {MaterialsKevlar.PolyurethaneResin.getFluid(1000L)}, - null, - 200, - 500000); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 9L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 45L) - }, - new FluidStack[] { - MaterialsKevlar.Ethyleneglycol.getFluid(36000), MaterialsKevlar.SiliconOil.getFluid(9000) - }, - new FluidStack[] {MaterialsKevlar.PolyurethaneResin.getFluid(9000L)}, - null, - 1500, - 500000); + GT_Values.RA + .addMultiblockChemicalRecipe( + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 1L), + GT_OreDictUnificator + .get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 5L) }, + new FluidStack[] { MaterialsKevlar.Ethyleneglycol.getFluid(4000), + MaterialsKevlar.SiliconOil.getFluid(1000) }, + new FluidStack[] { MaterialsKevlar.PolyurethaneResin.getFluid(1000L) }, + null, + 200, + 500000); + GT_Values.RA + .addMultiblockChemicalRecipe( + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 9L), + GT_OreDictUnificator + .get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 45L) }, + new FluidStack[] { MaterialsKevlar.Ethyleneglycol.getFluid(36000), + MaterialsKevlar.SiliconOil.getFluid(9000) }, + new FluidStack[] { MaterialsKevlar.PolyurethaneResin.getFluid(9000L) }, + null, + 1500, + 500000); // 3NH3 + 6CH4O =Al2O3,SiO2= CH5N + C2H7N + C3H9N + 6H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L) - }, - new FluidStack[] {Materials.Methanol.getFluid(6000), Materials.Ammonia.getGas(3000)}, - new FluidStack[] { - MaterialsKevlar.Methylamine.getGas(1000L), - Materials.Dimethylamine.getGas(1000L), - MaterialsKevlar.Trimethylamine.getGas(1000L), - Materials.Water.getFluid(6000L) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L) }, + new FluidStack[] { Materials.Methanol.getFluid(6000), Materials.Ammonia.getGas(3000) }, + new FluidStack[] { MaterialsKevlar.Methylamine.getGas(1000L), Materials.Dimethylamine.getGas(1000L), + MaterialsKevlar.Trimethylamine.getGas(1000L), Materials.Water.getFluid(6000L) }, null, 400, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(11), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9L) - }, - new FluidStack[] {Materials.Methanol.getFluid(54000), Materials.Ammonia.getGas(27000)}, - new FluidStack[] { - MaterialsKevlar.Methylamine.getGas(9000L), - Materials.Dimethylamine.getGas(9000L), - MaterialsKevlar.Trimethylamine.getGas(9000L), - Materials.Water.getFluid(54000L) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(11), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9L) }, + new FluidStack[] { Materials.Methanol.getFluid(54000), Materials.Ammonia.getGas(27000) }, + new FluidStack[] { MaterialsKevlar.Methylamine.getGas(9000L), Materials.Dimethylamine.getGas(9000L), + MaterialsKevlar.Trimethylamine.getGas(9000L), Materials.Water.getFluid(54000L) }, null, 3000, 1920); // 18SOCl2 + 5C10H10O4 + 6CO2 = 7C8H4Cl2O2 + 22HCl + 18SO2 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - MaterialsKevlar.ThionylChloride.getFluid(18000), - MaterialsKevlar.DimethylTerephthalate.getFluid(5000L), - Materials.CarbonDioxide.getGas(6000L) - }, - new FluidStack[] { - Materials.DilutedHydrochloricAcid.getFluid(22000L), Materials.SulfurDioxide.getGas(18000L) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { MaterialsKevlar.ThionylChloride.getFluid(18000), + MaterialsKevlar.DimethylTerephthalate.getFluid(5000L), Materials.CarbonDioxide.getGas(6000L) }, + new FluidStack[] { Materials.DilutedHydrochloricAcid.getFluid(22000L), + Materials.SulfurDioxide.getGas(18000L) }, new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 48L) - }, + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 48L) }, 400, 1920); // 2CH4O + C8H6O4 =H2SO4= C10H10O4 + 2H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - MaterialsKevlar.TerephthalicAcid.getFluid(1000L), - Materials.Methanol.getFluid(2000), - Materials.SulfuricAcid.getFluid(2000) - }, - new FluidStack[] { - MaterialsKevlar.DimethylTerephthalate.getFluid(1000L), Materials.DilutedSulfuricAcid.getFluid(2000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { MaterialsKevlar.TerephthalicAcid.getFluid(1000L), Materials.Methanol.getFluid(2000), + Materials.SulfuricAcid.getFluid(2000) }, + new FluidStack[] { MaterialsKevlar.DimethylTerephthalate.getFluid(1000L), + Materials.DilutedSulfuricAcid.getFluid(2000) }, null, 250, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] { - MaterialsKevlar.TerephthalicAcid.getFluid(9000L), - Materials.Methanol.getFluid(18000), - Materials.SulfuricAcid.getFluid(18000) - }, - new FluidStack[] { - MaterialsKevlar.DimethylTerephthalate.getFluid(9000L), Materials.DilutedSulfuricAcid.getFluid(18000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { MaterialsKevlar.TerephthalicAcid.getFluid(9000L), Materials.Methanol.getFluid(18000), + Materials.SulfuricAcid.getFluid(18000) }, + new FluidStack[] { MaterialsKevlar.DimethylTerephthalate.getFluid(9000L), + Materials.DilutedSulfuricAcid.getFluid(18000) }, null, 1750, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] {Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000)}, - new FluidStack[] {MaterialsKevlar.IIIDimethylbenzene.getFluid(1000L), Materials.Hydrogen.getGas(4000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000) }, + new FluidStack[] { MaterialsKevlar.IIIDimethylbenzene.getFluid(1000L), + Materials.Hydrogen.getGas(4000) }, null, 4000, 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(3)}, - new FluidStack[] {Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000)}, - new FluidStack[] {MaterialsKevlar.IVDimethylbenzene.getFluid(1000L), Materials.Hydrogen.getGas(4000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(3) }, + new FluidStack[] { Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000) }, + new FluidStack[] { MaterialsKevlar.IVDimethylbenzene.getFluid(1000L), Materials.Hydrogen.getGas(4000) }, null, 4000, 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIHydroxide, 45L) - }, - new FluidStack[] {MaterialsKevlar.NaphthenicAcid.getFluid(10000L)}, - new FluidStack[] { - GT_Values.NF, - }, - new ItemStack[] { - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(49), - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIHydroxide, 45L) }, + new FluidStack[] { MaterialsKevlar.NaphthenicAcid.getFluid(10000L) }, + new FluidStack[] { GT_Values.NF, }, + new ItemStack[] { MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(49), }, 200, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 7L) - }, - new FluidStack[] {MaterialsKevlar.NaphthenicAcid.getFluid(10000L)}, - new FluidStack[] { - Materials.AceticAcid.getFluid(15000L), - }, - new ItemStack[] { - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(49), - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 7L) }, + new FluidStack[] { MaterialsKevlar.NaphthenicAcid.getFluid(10000L) }, + new FluidStack[] { Materials.AceticAcid.getFluid(15000L), }, + new ItemStack[] { MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(49), }, 200, 1920); // PCl3 + 3C6H5Cl + 6Na = 6NaCl + C18H15P GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 6L) - }, - new FluidStack[] { - MaterialsKevlar.PhosphorusTrichloride.getFluid(1000L), Materials.Chlorobenzene.getFluid(3000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 6L) }, + new FluidStack[] { MaterialsKevlar.PhosphorusTrichloride.getFluid(1000L), + Materials.Chlorobenzene.getFluid(3000) }, null, - new ItemStack[] {MaterialsKevlar.Triphenylphosphene.getDust(34), Materials.Salt.getDust(12)}, + new ItemStack[] { MaterialsKevlar.Triphenylphosphene.getDust(34), Materials.Salt.getDust(12) }, 400, 1920); // 4NaH + C3H9BO3 = NaBH4 + 3CH3ONa GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1), MaterialsKevlar.SodiumHydride.getDust(8)}, - new FluidStack[] {MaterialsKevlar.TrimethylBorate.getFluid(1000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), MaterialsKevlar.SodiumHydride.getDust(8) }, + new FluidStack[] { MaterialsKevlar.TrimethylBorate.getFluid(1000L) }, null, - new ItemStack[] { - MaterialsKevlar.SodiumBorohydride.getDust(6), MaterialsKevlar.SodiumMethoxide.getDust(18) - }, + new ItemStack[] { MaterialsKevlar.SodiumBorohydride.getDust(6), + MaterialsKevlar.SodiumMethoxide.getDust(18) }, 600, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.SodiumHydride.getDust(64)}, - new FluidStack[] {MaterialsKevlar.TrimethylBorate.getFluid(8000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.SodiumHydride.getDust(64) }, + new FluidStack[] { MaterialsKevlar.TrimethylBorate.getFluid(8000L) }, null, - new ItemStack[] { - MaterialsKevlar.SodiumBorohydride.getDust(48), - MaterialsKevlar.SodiumMethoxide.getDust(64), - MaterialsKevlar.SodiumMethoxide.getDust(64), - MaterialsKevlar.SodiumMethoxide.getDust(16) - }, + new ItemStack[] { MaterialsKevlar.SodiumBorohydride.getDust(48), + MaterialsKevlar.SodiumMethoxide.getDust(64), MaterialsKevlar.SodiumMethoxide.getDust(64), + MaterialsKevlar.SodiumMethoxide.getDust(16) }, 600, 1920); // 2CH3COOH = CH3COCH3 + CO2 + H GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.copyAmount(0, Materials.Calcite.getDust(5)), GT_Utility.getIntegratedCircuit(24) - }, - new FluidStack[] {Materials.AceticAcid.getFluid(2000)}, - new FluidStack[] { - Materials.Acetone.getFluid(1000), - Materials.CarbonDioxide.getGas(1000), - Materials.Water.getFluid(1000) - }, + new ItemStack[] { GT_Utility.copyAmount(0, Materials.Calcite.getDust(5)), + GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.AceticAcid.getFluid(2000) }, + new FluidStack[] { Materials.Acetone.getFluid(1000), Materials.CarbonDioxide.getGas(1000), + Materials.Water.getFluid(1000) }, null, 400, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.copyAmount(0, Materials.Calcium.getDust(1)), GT_Utility.getIntegratedCircuit(24) - }, - new FluidStack[] {Materials.AceticAcid.getFluid(2000)}, - new FluidStack[] { - Materials.Acetone.getFluid(1000), - Materials.CarbonDioxide.getGas(1000), - Materials.Water.getFluid(1000) - }, + new ItemStack[] { GT_Utility.copyAmount(0, Materials.Calcium.getDust(1)), + GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.AceticAcid.getFluid(2000) }, + new FluidStack[] { Materials.Acetone.getFluid(1000), Materials.CarbonDioxide.getGas(1000), + Materials.Water.getFluid(1000) }, null, 400, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.copyAmount(0, Materials.Quicklime.getDust(2)), GT_Utility.getIntegratedCircuit(24) - }, - new FluidStack[] {Materials.AceticAcid.getFluid(2000)}, - new FluidStack[] { - Materials.Acetone.getFluid(1000), - Materials.CarbonDioxide.getGas(1000), - Materials.Water.getFluid(1000) - }, + new ItemStack[] { GT_Utility.copyAmount(0, Materials.Quicklime.getDust(2)), + GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.AceticAcid.getFluid(2000) }, + new FluidStack[] { Materials.Acetone.getFluid(1000), Materials.CarbonDioxide.getGas(1000), + Materials.Water.getFluid(1000) }, null, 400, 480); // C + 4H + O = CH3OH GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(23)}, - new FluidStack[] {Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(1000)}, - new FluidStack[] {Materials.Methanol.getFluid(1000)}, + new ItemStack[] { Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(23) }, + new FluidStack[] { Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(1000) }, + new FluidStack[] { Materials.Methanol.getFluid(1000) }, null, 320, 96); @@ -4336,610 +4236,530 @@ public class ChemicalRecipes implements Runnable { // This recipe collides with one for Vinyl Chloride // 2C + 4H + 2O = CH3COOH GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.Carbon.getDust(2), GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(2000)}, - new FluidStack[] {Materials.AceticAcid.getFluid(1000)}, + new ItemStack[] { Materials.Carbon.getDust(2), GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(2000) }, + new FluidStack[] { Materials.AceticAcid.getFluid(1000) }, null, 480, 30); // 2CO + 4H = CH3COOH GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.CarbonMonoxide.getGas(2000), Materials.Hydrogen.getGas(4000)}, - new FluidStack[] {Materials.AceticAcid.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.CarbonMonoxide.getGas(2000), Materials.Hydrogen.getGas(4000) }, + new FluidStack[] { Materials.AceticAcid.getFluid(1000) }, null, 320, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(8)}, - new FluidStack[] {Materials.Hydrogen.getGas(9000), Materials.Chlorine.getGas(9000)}, - new FluidStack[] {Materials.HydrochloricAcid.getFluid(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(8) }, + new FluidStack[] { Materials.Hydrogen.getGas(9000), Materials.Chlorine.getGas(9000) }, + new FluidStack[] { Materials.HydrochloricAcid.getFluid(9000) }, null, 7, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] { - Materials.Chlorine.getGas(10000), Materials.Water.getFluid(10000), Materials.Mercury.getFluid(1000) - }, - new FluidStack[] {Materials.HypochlorousAcid.getFluid(10000), Materials.Hydrogen.getGas(10000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Chlorine.getGas(10000), Materials.Water.getFluid(10000), + Materials.Mercury.getFluid(1000) }, + new FluidStack[] { Materials.HypochlorousAcid.getFluid(10000), Materials.Hydrogen.getGas(10000) }, null, 600, 8); // H2O + 4Cl + C3H6 + NaOH = C3H5ClO + NaCl·H2O + 2HCl GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(23)}, - new FluidStack[] { - Materials.Propene.getGas(1000), Materials.Chlorine.getGas(4000), Materials.Water.getFluid(1000) - }, - new FluidStack[] { - Materials.Epichlorohydrin.getFluid(1000), - Materials.SaltWater.getFluid(1000), - Materials.HydrochloricAcid.getFluid(2000) - }, + new ItemStack[] { Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(23) }, + new FluidStack[] { Materials.Propene.getGas(1000), Materials.Chlorine.getGas(4000), + Materials.Water.getFluid(1000) }, + new FluidStack[] { Materials.Epichlorohydrin.getFluid(1000), Materials.SaltWater.getFluid(1000), + Materials.HydrochloricAcid.getFluid(2000) }, null, 640, 30); // H2O + 2Cl + C3H6 + NaOH =Hg= C3H5ClO + NaCl·H2O + 2H GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.Propene.getGas(1000), - Materials.Chlorine.getGas(2000), - Materials.Water.getFluid(1000), - Materials.Mercury.getFluid(100) - }, - new FluidStack[] { - Materials.Epichlorohydrin.getFluid(1000), - Materials.SaltWater.getFluid(1000), - Materials.Hydrogen.getGas(2000) - }, + new ItemStack[] { Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Propene.getGas(1000), Materials.Chlorine.getGas(2000), + Materials.Water.getFluid(1000), Materials.Mercury.getFluid(100) }, + new FluidStack[] { Materials.Epichlorohydrin.getFluid(1000), Materials.SaltWater.getFluid(1000), + Materials.Hydrogen.getGas(2000) }, null, 640, 30); // HClO + 2Cl + C3H6 + NaOH = C3H5ClO + NaCl·H2O + HCl GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.Propene.getGas(1000), - Materials.Chlorine.getGas(2000), - Materials.HypochlorousAcid.getFluid(1000) - }, - new FluidStack[] { - Materials.Epichlorohydrin.getFluid(1000), - Materials.SaltWater.getFluid(1000), - Materials.HydrochloricAcid.getFluid(1000) - }, + new ItemStack[] { Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Propene.getGas(1000), Materials.Chlorine.getGas(2000), + Materials.HypochlorousAcid.getFluid(1000) }, + new FluidStack[] { Materials.Epichlorohydrin.getFluid(1000), Materials.SaltWater.getFluid(1000), + Materials.HydrochloricAcid.getFluid(1000) }, null, 640, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.Apatite.getDust(9)}, - new FluidStack[] {Materials.SulfuricAcid.getFluid(5000), Materials.Water.getFluid(10000)}, - new FluidStack[] {Materials.PhosphoricAcid.getFluid(3000), Materials.HydrochloricAcid.getFluid(1000)}, - new ItemStack[] {Materials.Gypsum.getDust(40)}, + new ItemStack[] { Materials.Apatite.getDust(9) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(5000), Materials.Water.getFluid(10000) }, + new FluidStack[] { Materials.PhosphoricAcid.getFluid(3000), Materials.HydrochloricAcid.getFluid(1000) }, + new ItemStack[] { Materials.Gypsum.getDust(40) }, 320, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.Phosphorus.getDust(4), GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] {Materials.Oxygen.getGas(10000)}, + new ItemStack[] { Materials.Phosphorus.getDust(4), GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.Oxygen.getGas(10000) }, null, - new ItemStack[] {Materials.PhosphorousPentoxide.getDust(14)}, + new ItemStack[] { Materials.PhosphorousPentoxide.getDust(14) }, 40, 30); // 2P + 5O + 3H2O = 2H3PO4 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.Phosphorus.getDust(1), GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Oxygen.getGas(2500), Materials.Water.getFluid(1500)}, - new FluidStack[] {Materials.PhosphoricAcid.getFluid(1000)}, + new ItemStack[] { Materials.Phosphorus.getDust(1), GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Oxygen.getGas(2500), Materials.Water.getFluid(1500) }, + new FluidStack[] { Materials.PhosphoricAcid.getFluid(1000) }, null, 320, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.Propene.getGas(8000), - Materials.Benzene.getFluid(8000), - Materials.PhosphoricAcid.getFluid(1000) - }, - new FluidStack[] {Materials.Cumene.getFluid(8000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.Propene.getGas(8000), Materials.Benzene.getFluid(8000), + Materials.PhosphoricAcid.getFluid(1000) }, + new FluidStack[] { Materials.Cumene.getFluid(8000) }, null, 1920, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.Propene.getGas(1000), - Materials.Benzene.getFluid(1000), - Materials.PhosphoricAcid.getFluid(100), - Materials.Oxygen.getGas(2000) - }, - new FluidStack[] {Materials.Phenol.getFluid(1000), Materials.Acetone.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Propene.getGas(1000), Materials.Benzene.getFluid(1000), + Materials.PhosphoricAcid.getFluid(100), Materials.Oxygen.getGas(2000) }, + new FluidStack[] { Materials.Phenol.getFluid(1000), Materials.Acetone.getFluid(1000) }, null, 480, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.Acetone.getFluid(1000), - Materials.Phenol.getFluid(2000), - Materials.HydrochloricAcid.getFluid(1000) - }, - new FluidStack[] {Materials.BisphenolA.getFluid(1000), Materials.Water.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.Acetone.getFluid(1000), Materials.Phenol.getFluid(2000), + Materials.HydrochloricAcid.getFluid(1000) }, + new FluidStack[] { Materials.BisphenolA.getFluid(1000), Materials.Water.getFluid(1000) }, null, 160, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.Acetone.getFluid(1000), - Materials.Phenol.getFluid(2000), - Materials.HydrochloricAcid.getFluid(1000), - Materials.Epichlorohydrin.getFluid(2000) - }, - new FluidStack[] {Materials.Epoxid.getMolten(1000), Materials.SaltWater.getFluid(2000)}, + new ItemStack[] { Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Acetone.getFluid(1000), Materials.Phenol.getFluid(2000), + Materials.HydrochloricAcid.getFluid(1000), Materials.Epichlorohydrin.getFluid(2000) }, + new FluidStack[] { Materials.Epoxid.getMolten(1000), Materials.SaltWater.getFluid(2000) }, null, 480, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] {Materials.Hydrogen.getGas(9000), Materials.Fluorine.getGas(9000)}, - new FluidStack[] {Materials.HydrofluoricAcid.getFluid(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.Hydrogen.getGas(9000), Materials.Fluorine.getGas(9000) }, + new FluidStack[] { Materials.HydrofluoricAcid.getFluid(9000) }, null, 7, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.HydrofluoricAcid.getFluid(4000), - Materials.Methane.getGas(2000), - Materials.Chlorine.getGas(12000) - }, - new FluidStack[] {Materials.Tetrafluoroethylene.getGas(1000), Materials.HydrochloricAcid.getFluid(12000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.HydrofluoricAcid.getFluid(4000), Materials.Methane.getGas(2000), + Materials.Chlorine.getGas(12000) }, + new FluidStack[] { Materials.Tetrafluoroethylene.getGas(1000), + Materials.HydrochloricAcid.getFluid(12000) }, null, 540, 240); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.Methane.getGas(2000), Materials.Chlorine.getGas(4000), Materials.Water.getFluid(1000) - }, - new FluidStack[] { - Materials.HydrochloricAcid.getFluid(2000), Materials.DilutedHydrochloricAcid.getFluid(2000) - }, - new ItemStack[] {Materials.Polydimethylsiloxane.getDust(3)}, + new ItemStack[] { Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Methane.getGas(2000), Materials.Chlorine.getGas(4000), + Materials.Water.getFluid(1000) }, + new FluidStack[] { Materials.HydrochloricAcid.getFluid(2000), + Materials.DilutedHydrochloricAcid.getFluid(2000) }, + new ItemStack[] { Materials.Polydimethylsiloxane.getDust(3) }, 480, 96); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Methanol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000)}, - new FluidStack[] {Materials.DilutedHydrochloricAcid.getFluid(2000)}, - new ItemStack[] {Materials.Polydimethylsiloxane.getDust(3)}, + new ItemStack[] { Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Methanol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000) }, + new FluidStack[] { Materials.DilutedHydrochloricAcid.getFluid(2000) }, + new ItemStack[] { Materials.Polydimethylsiloxane.getDust(3) }, 480, 96); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Nitrogen.getGas(10000), Materials.Hydrogen.getGas(30000)}, - new FluidStack[] {Materials.Ammonia.getGas(10000)}, - new ItemStack[] {null}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Nitrogen.getGas(10000), Materials.Hydrogen.getGas(30000) }, + new FluidStack[] { Materials.Ammonia.getGas(10000) }, + new ItemStack[] { null }, 800, 480); // 2NH3 + 7O = N2O4 + 3H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(23)}, - new FluidStack[] {Materials.Ammonia.getGas(2000), Materials.Oxygen.getGas(7000)}, - new FluidStack[] {Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(23) }, + new FluidStack[] { Materials.Ammonia.getGas(2000), Materials.Oxygen.getGas(7000) }, + new FluidStack[] { Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000) }, null, 480, 30); // 7O + 6H + 2N = N2O4 + 3H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(23)}, - new FluidStack[] { - Materials.Nitrogen.getGas(2000), Materials.Hydrogen.getGas(6000), Materials.Oxygen.getGas(7000) - }, - new FluidStack[] {Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(23) }, + new FluidStack[] { Materials.Nitrogen.getGas(2000), Materials.Hydrogen.getGas(6000), + Materials.Oxygen.getGas(7000) }, + new FluidStack[] { Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000) }, null, 1100, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] {Materials.Oxygen.getGas(100000), Materials.Ammonia.getGas(36000)}, - new FluidStack[] {Materials.NitricOxide.getGas(36000), Materials.Water.getFluid(54000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.Oxygen.getGas(100000), Materials.Ammonia.getGas(36000) }, + new FluidStack[] { Materials.NitricOxide.getGas(36000), Materials.Water.getFluid(54000) }, null, 170, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(8)}, - new FluidStack[] {Materials.Oxygen.getGas(100000), Materials.Ammonia.getGas(36000)}, - new FluidStack[] {Materials.NitricOxide.getGas(36000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(8) }, + new FluidStack[] { Materials.Oxygen.getGas(100000), Materials.Ammonia.getGas(36000) }, + new FluidStack[] { Materials.NitricOxide.getGas(36000) }, null, 170, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] {Materials.NitricOxide.getGas(9000), Materials.Oxygen.getGas(9000)}, - new FluidStack[] {Materials.NitrogenDioxide.getGas(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.NitricOxide.getGas(9000), Materials.Oxygen.getGas(9000) }, + new FluidStack[] { Materials.NitrogenDioxide.getGas(9000) }, null, 80, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] {Materials.NitrogenDioxide.getGas(27000), Materials.Water.getFluid(9000)}, - new FluidStack[] {Materials.NitricAcid.getFluid(18000), Materials.NitricOxide.getGas(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.NitrogenDioxide.getGas(27000), Materials.Water.getFluid(9000) }, + new FluidStack[] { Materials.NitricAcid.getFluid(18000), Materials.NitricOxide.getGas(9000) }, null, 120, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.Hydrogen.getGas(3000), Materials.Nitrogen.getGas(1000), Materials.Oxygen.getGas(4000) - }, - new FluidStack[] {Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Hydrogen.getGas(3000), Materials.Nitrogen.getGas(1000), + Materials.Oxygen.getGas(4000) }, + new FluidStack[] { Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000) }, null, 320, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Ammonia.getGas(1000), Materials.Oxygen.getGas(4000)}, - new FluidStack[] {Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Ammonia.getGas(1000), Materials.Oxygen.getGas(4000) }, + new FluidStack[] { Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000) }, null, 320, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.NitrogenDioxide.getGas(2000), - Materials.Oxygen.getGas(1000), - Materials.Water.getFluid(1000) - }, - new FluidStack[] {Materials.NitricAcid.getFluid(2000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.NitrogenDioxide.getGas(2000), Materials.Oxygen.getGas(1000), + Materials.Water.getFluid(1000) }, + new FluidStack[] { Materials.NitricAcid.getFluid(2000) }, null, 320, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9)}, - new FluidStack[] {Materials.Hydrogen.getGas(18000)}, - new FluidStack[] {Materials.HydricSulfide.getGas(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9) }, + new FluidStack[] { Materials.Hydrogen.getGas(18000) }, + new FluidStack[] { Materials.HydricSulfide.getGas(9000) }, null, 4, 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9)}, - new FluidStack[] {Materials.Oxygen.getGas(18000)}, - new FluidStack[] {Materials.SulfurDioxide.getGas(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9) }, + new FluidStack[] { Materials.Oxygen.getGas(18000) }, + new FluidStack[] { Materials.SulfurDioxide.getGas(9000) }, null, 4, 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] {Materials.HydricSulfide.getGas(9000), Materials.Oxygen.getGas(27000)}, - new FluidStack[] {Materials.SulfurDioxide.getGas(9000), Materials.Water.getFluid(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.HydricSulfide.getGas(9000), Materials.Oxygen.getGas(27000) }, + new FluidStack[] { Materials.SulfurDioxide.getGas(9000), Materials.Water.getFluid(9000) }, null, 60, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(8)}, - new FluidStack[] {Materials.HydricSulfide.getGas(9000), Materials.Oxygen.getGas(27000)}, - new FluidStack[] {Materials.SulfurDioxide.getGas(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(8) }, + new FluidStack[] { Materials.HydricSulfide.getGas(9000), Materials.Oxygen.getGas(27000) }, + new FluidStack[] { Materials.SulfurDioxide.getGas(9000) }, null, 60, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(7)}, - new FluidStack[] {Materials.SulfurDioxide.getGas(9000), Materials.HydricSulfide.getGas(18000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(7) }, + new FluidStack[] { Materials.SulfurDioxide.getGas(9000), Materials.HydricSulfide.getGas(18000) }, null, - new ItemStack[] {Materials.Sulfur.getDust(27)}, + new ItemStack[] { Materials.Sulfur.getDust(27) }, 60, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] {Materials.SulfurTrioxide.getGas(9000), Materials.Water.getFluid(9000)}, - new FluidStack[] {Materials.SulfuricAcid.getFluid(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.SulfurTrioxide.getGas(9000), Materials.Water.getFluid(9000) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(9000) }, null, 260, 480); // S + O3 + H2O = H2SO4 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24), Materials.Sulfur.getDust(1)}, - new FluidStack[] {Materials.Oxygen.getGas(3000), Materials.Water.getFluid(1000)}, - new FluidStack[] {Materials.SulfuricAcid.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24), Materials.Sulfur.getDust(1) }, + new FluidStack[] { Materials.Oxygen.getGas(3000), Materials.Water.getFluid(1000) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(1000) }, null, 480, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(7), Materials.Sulfur.getDust(9)}, - new FluidStack[] {Materials.Oxygen.getGas(27000), Materials.Water.getFluid(9000)}, - new FluidStack[] {Materials.SulfuricAcid.getFluid(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(7), Materials.Sulfur.getDust(9) }, + new FluidStack[] { Materials.Oxygen.getGas(27000), Materials.Water.getFluid(9000) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(9000) }, null, 260, 480); // H2S + O4 = H2SO4 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.HydricSulfide.getGas(1000), Materials.Oxygen.getGas(4000)}, - new FluidStack[] {Materials.SulfuricAcid.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.HydricSulfide.getGas(1000), Materials.Oxygen.getGas(4000) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(1000) }, null, 480, 30); // SO2 + O + H2O = H2SO4 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.SulfurDioxide.getGas(1000), Materials.Oxygen.getGas(1000), Materials.Water.getFluid(1000) - }, - new FluidStack[] {Materials.SulfuricAcid.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.SulfurDioxide.getGas(1000), Materials.Oxygen.getGas(1000), + Materials.Water.getFluid(1000) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(1000) }, null, 600, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] { - Materials.SulfurDioxide.getGas(9000), Materials.Oxygen.getGas(9000), Materials.Water.getFluid(9000) - }, - new FluidStack[] {Materials.SulfuricAcid.getFluid(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.SulfurDioxide.getGas(9000), Materials.Oxygen.getGas(9000), + Materials.Water.getFluid(9000) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(9000) }, null, 150, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] { - Materials.HydrochloricAcid.getFluid(1000), - Materials.Ethylene.getGas(1000), - Materials.Oxygen.getGas(1000) - }, - new FluidStack[] {Materials.VinylChloride.getGas(1000), Materials.Water.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.HydrochloricAcid.getFluid(1000), Materials.Ethylene.getGas(1000), + Materials.Oxygen.getGas(1000) }, + new FluidStack[] { Materials.VinylChloride.getGas(1000), Materials.Water.getFluid(1000) }, null, 160, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.Chlorine.getGas(2000), Materials.Ethylene.getGas(2000), Materials.Oxygen.getGas(1000) - }, - new FluidStack[] {Materials.VinylChloride.getGas(2000), Materials.Water.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Chlorine.getGas(2000), Materials.Ethylene.getGas(2000), + Materials.Oxygen.getGas(1000) }, + new FluidStack[] { Materials.VinylChloride.getGas(2000), Materials.Water.getFluid(1000) }, null, 240, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] { - Materials.Isoprene.getFluid(1728), - Materials.Air.getGas(6000), - Materials.Titaniumtetrachloride.getFluid(80) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Isoprene.getFluid(1728), Materials.Air.getGas(6000), + Materials.Titaniumtetrachloride.getFluid(80) }, null, - new ItemStack[] {Materials.RawRubber.getDust(18)}, + new ItemStack[] { Materials.RawRubber.getDust(18) }, 640, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] { - Materials.Isoprene.getFluid(1728), - Materials.Oxygen.getGas(6000), - Materials.Titaniumtetrachloride.getFluid(80) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Isoprene.getFluid(1728), Materials.Oxygen.getGas(6000), + Materials.Titaniumtetrachloride.getFluid(80) }, null, - new ItemStack[] {Materials.RawRubber.getDust(24)}, + new ItemStack[] { Materials.RawRubber.getDust(24) }, 640, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(3)}, - new FluidStack[] { - Materials.Styrene.getFluid(36), Materials.Butadiene.getGas(108), Materials.Air.getGas(2000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(3) }, + new FluidStack[] { Materials.Styrene.getFluid(36), Materials.Butadiene.getGas(108), + Materials.Air.getGas(2000) }, null, - new ItemStack[] {Materials.RawStyreneButadieneRubber.getDust(1)}, + new ItemStack[] { Materials.RawStyreneButadieneRubber.getDust(1) }, 160, 240); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(3)}, - new FluidStack[] { - Materials.Styrene.getFluid(72), Materials.Butadiene.getGas(216), Materials.Oxygen.getGas(2000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(3) }, + new FluidStack[] { Materials.Styrene.getFluid(72), Materials.Butadiene.getGas(216), + Materials.Oxygen.getGas(2000) }, null, - new ItemStack[] {Materials.RawStyreneButadieneRubber.getDust(3)}, + new ItemStack[] { Materials.RawStyreneButadieneRubber.getDust(3) }, 160, 240); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(4)}, - new FluidStack[] { - Materials.Styrene.getFluid(540), - Materials.Butadiene.getGas(1620), - Materials.Titaniumtetrachloride.getFluid(100), - Materials.Air.getGas(15000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(4) }, + new FluidStack[] { Materials.Styrene.getFluid(540), Materials.Butadiene.getGas(1620), + Materials.Titaniumtetrachloride.getFluid(100), Materials.Air.getGas(15000) }, null, - new ItemStack[] { - Materials.RawStyreneButadieneRubber.getDust(22), Materials.RawStyreneButadieneRubber.getDustSmall(2) - }, + new ItemStack[] { Materials.RawStyreneButadieneRubber.getDust(22), + Materials.RawStyreneButadieneRubber.getDustSmall(2) }, 640, 240); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(4)}, - new FluidStack[] { - Materials.Styrene.getFluid(540), - Materials.Butadiene.getGas(1620), - Materials.Titaniumtetrachloride.getFluid(100), - Materials.Oxygen.getGas(7500) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(4) }, + new FluidStack[] { Materials.Styrene.getFluid(540), Materials.Butadiene.getGas(1620), + Materials.Titaniumtetrachloride.getFluid(100), Materials.Oxygen.getGas(7500) }, null, - new ItemStack[] {Materials.RawStyreneButadieneRubber.getDust(30)}, + new ItemStack[] { Materials.RawStyreneButadieneRubber.getDust(30) }, 640, 240); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9), Materials.Salt.getDust(18)}, - new FluidStack[] {Materials.SulfuricAcid.getFluid(9000)}, - new FluidStack[] {Materials.HydrochloricAcid.getFluid(9000)}, - new ItemStack[] {Materials.SodiumBisulfate.getDust(63)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), Materials.Salt.getDust(18) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(9000) }, + new FluidStack[] { Materials.HydrochloricAcid.getFluid(9000) }, + new ItemStack[] { Materials.SodiumBisulfate.getDust(63) }, 135, 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9), Materials.SodiumHydroxide.getDust(27)}, - new FluidStack[] {Materials.SulfuricAcid.getFluid(9000)}, - new FluidStack[] {Materials.Water.getFluid(9000)}, - new ItemStack[] {Materials.SodiumBisulfate.getDust(63)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), Materials.SodiumHydroxide.getDust(27) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(9000) }, + new FluidStack[] { Materials.Water.getFluid(9000) }, + new ItemStack[] { Materials.SodiumBisulfate.getDust(63) }, 135, 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.Benzene.getFluid(1000), Materials.Chlorine.getGas(2000), Materials.Water.getFluid(1000) - }, - new FluidStack[] { - Materials.Phenol.getFluid(1000), - Materials.HydrochloricAcid.getFluid(1000), - Materials.DilutedHydrochloricAcid.getFluid(1000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Benzene.getFluid(1000), Materials.Chlorine.getGas(2000), + Materials.Water.getFluid(1000) }, + new FluidStack[] { Materials.Phenol.getFluid(1000), Materials.HydrochloricAcid.getFluid(1000), + Materials.DilutedHydrochloricAcid.getFluid(1000) }, null, 560, 30); // C6H6 + 2Cl + NaOH = C6H6O + NaCl + HCl GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Benzene.getFluid(2000), Materials.Chlorine.getGas(4000)}, - new FluidStack[] {Materials.Phenol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000)}, - new ItemStack[] {Materials.Salt.getDust(4)}, + new ItemStack[] { Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Benzene.getFluid(2000), Materials.Chlorine.getGas(4000) }, + new FluidStack[] { Materials.Phenol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000) }, + new ItemStack[] { Materials.Salt.getDust(4) }, 1120, 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.LightFuel.getFluid(20000), Materials.HeavyFuel.getFluid(4000)}, - new FluidStack[] {Materials.Fuel.getFluid(24000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.LightFuel.getFluid(20000), Materials.HeavyFuel.getFluid(4000) }, + new FluidStack[] { Materials.Fuel.getFluid(24000) }, null, 100, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Fuel.getFluid(10000), Materials.Tetranitromethane.getFluid(200)}, - new FluidStack[] {Materials.NitroFuel.getFluid(10000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Fuel.getFluid(10000), Materials.Tetranitromethane.getFluid(200) }, + new FluidStack[] { Materials.NitroFuel.getFluid(10000) }, null, 120, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.BioDiesel.getFluid(10000), Materials.Tetranitromethane.getFluid(400)}, - new FluidStack[] {Materials.NitroFuel.getFluid(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.BioDiesel.getFluid(10000), Materials.Tetranitromethane.getFluid(400) }, + new FluidStack[] { Materials.NitroFuel.getFluid(9000) }, null, 120, 480); // CH4 + 2H2O = CO2 + 8H GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(11)}, - new FluidStack[] {Materials.Methane.getGas(5000), GT_ModHandler.getDistilledWater(10000)}, - new FluidStack[] {Materials.CarbonDioxide.getGas(5000), Materials.Hydrogen.getGas(40000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(11) }, + new FluidStack[] { Materials.Methane.getGas(5000), GT_ModHandler.getDistilledWater(10000) }, + new FluidStack[] { Materials.CarbonDioxide.getGas(5000), Materials.Hydrogen.getGas(40000) }, null, 200, 480); // CH4 + H2O = CO + 6H GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(12)}, - new FluidStack[] {Materials.Methane.getGas(5000), GT_ModHandler.getDistilledWater(5000)}, - new FluidStack[] {Materials.CarbonMonoxide.getGas(5000), Materials.Hydrogen.getGas(30000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(12) }, + new FluidStack[] { Materials.Methane.getGas(5000), GT_ModHandler.getDistilledWater(5000) }, + new FluidStack[] { Materials.CarbonMonoxide.getGas(5000), Materials.Hydrogen.getGas(30000) }, null, 200, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Nitrogen.getGas(20000), Materials.Oxygen.getGas(10000)}, - new FluidStack[] {Materials.NitrousOxide.getGas(10000)}, - new ItemStack[] {null}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Nitrogen.getGas(20000), Materials.Oxygen.getGas(10000) }, + new FluidStack[] { Materials.NitrousOxide.getGas(10000) }, + new ItemStack[] { null }, 50, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.Naphtha.getFluid(16000), - Materials.Gas.getGas(2000), - Materials.Methanol.getFluid(1000), - Materials.Acetone.getFluid(1000) - }, - new FluidStack[] {Materials.GasolineRaw.getFluid(20000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Naphtha.getFluid(16000), Materials.Gas.getGas(2000), + Materials.Methanol.getFluid(1000), Materials.Acetone.getFluid(1000) }, + new FluidStack[] { Materials.GasolineRaw.getFluid(20000) }, null, 100, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.GasolineRaw.getFluid(10000), Materials.Toluene.getFluid(1000)}, - new FluidStack[] {Materials.GasolineRegular.getFluid(11000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.GasolineRaw.getFluid(10000), Materials.Toluene.getFluid(1000) }, + new FluidStack[] { Materials.GasolineRegular.getFluid(11000) }, null, 10, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.GasolineRegular.getFluid(20000), - Materials.Octane.getFluid(2000), - Materials.NitrousOxide.getGas(6000), - Materials.Toluene.getFluid(1000), - Materials.AntiKnock.getFluid(3000L) - }, - new FluidStack[] {Materials.GasolinePremium.getFluid(32000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.GasolineRegular.getFluid(20000), Materials.Octane.getFluid(2000), + Materials.NitrousOxide.getGas(6000), Materials.Toluene.getFluid(1000), + Materials.AntiKnock.getFluid(3000L) }, + new FluidStack[] { Materials.GasolinePremium.getFluid(32000L) }, null, 50, 1920); // C2H6O + C4H8 = C6H14O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Ethanol.getFluid(1000), Materials.Butene.getGas(1000)}, - new FluidStack[] {Materials.AntiKnock.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Ethanol.getFluid(1000), Materials.Butene.getGas(1000) }, + new FluidStack[] { Materials.AntiKnock.getFluid(1000) }, null, 400, 480); // CH4O + C4H8 = C5H12O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Methanol.getFluid(1000), Materials.Butene.getGas(1000)}, - new FluidStack[] {Materials.MTBEMixture.getGas(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Methanol.getFluid(1000), Materials.Butene.getGas(1000) }, + new FluidStack[] { Materials.MTBEMixture.getGas(1000) }, null, 20, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - Materials.Naquadria.getMolten(4608L), - Materials.ElectrumFlux.getMolten(4608L), - Materials.Radon.getGas(16000L) - }, - new FluidStack[] {Materials.EnrichedNaquadria.getFluid(9216L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Naquadria.getMolten(4608L), Materials.ElectrumFlux.getMolten(4608L), + Materials.Radon.getGas(16000L) }, + new FluidStack[] { Materials.EnrichedNaquadria.getFluid(9216L) }, null, 600, 500000); @@ -4947,350 +4767,263 @@ public class ChemicalRecipes implements Runnable { if (isGTNHLanthanidLoaded && isGTPPLoaded) { // CH2O + 2C6H7N + HCl = C13H14N2(HCl) + H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("formaldehyde"), 1000), - new FluidStack(FluidRegistry.getFluid("aniline"), 2000), - Materials.HydrochloricAcid.getFluid(1000) - }, - new FluidStack[] {MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("formaldehyde"), 1000), + new FluidStack(FluidRegistry.getFluid("aniline"), 2000), + Materials.HydrochloricAcid.getFluid(1000) }, + new FluidStack[] { MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000L) }, null, 1200, 1920); // C6H5NO2 + 6H =Pd= C6H7N + 2H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1L) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 9000), Materials.Hydrogen.getGas(54000) - }, - new FluidStack[] { - Materials.Water.getFluid(18000), new FluidStack(FluidRegistry.getFluid("aniline"), 9000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 9000), + Materials.Hydrogen.getGas(54000) }, + new FluidStack[] { Materials.Water.getFluid(18000), + new FluidStack(FluidRegistry.getFluid("aniline"), 9000) }, null, 900, 1920); // C6H6 + HNO3 =H2SO4= C6H5NO2 + H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.Benzene.getFluid(5000), - Materials.SulfuricAcid.getFluid(3000), - Materials.NitricAcid.getFluid(5000), - GT_ModHandler.getDistilledWater(10000) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 5000), - Materials.DilutedSulfuricAcid.getFluid(3000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.Benzene.getFluid(5000), Materials.SulfuricAcid.getFluid(3000), + Materials.NitricAcid.getFluid(5000), GT_ModHandler.getDistilledWater(10000) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 5000), + Materials.DilutedSulfuricAcid.getFluid(3000) }, null, 8, 122880); // C13H14N2(HCl) + 2COCl2 = C15H10N2O2(5HCl) GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000L), - new FluidStack(FluidRegistry.getFluid("phosgene"), 2000) - }, - new FluidStack[] {MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000L), + new FluidStack(FluidRegistry.getFluid("phosgene"), 2000) }, + new FluidStack[] { MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000L) }, null, 600, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1L) - }, - new FluidStack[] {MaterialsKevlar.Butyraldehyde.getFluid(9000), Materials.Hydrogen.getGas(18000)}, - new FluidStack[] {new FluidStack(FluidRegistry.getFluid("butanol"), 9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1L) }, + new FluidStack[] { MaterialsKevlar.Butyraldehyde.getFluid(9000), Materials.Hydrogen.getGas(18000) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("butanol"), 9000) }, null, 80, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1L) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("butanol"), 2000), - new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000), - Materials.IronIIIChloride.getFluid(100) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("butanol"), 2000), + new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000), + Materials.IronIIIChloride.getFluid(100) }, null, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1L) }, 600, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 9L) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("butanol"), 18000), - new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000), - Materials.IronIIIChloride.getFluid(900) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 9L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("butanol"), 18000), + new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000), + Materials.IronIIIChloride.getFluid(900) }, null, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9L) }, 4500, 1920); // C2H4 + CO + H2O =C4NiO= C3H6O2 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.Ethylene.getGas(1000), - Materials.CarbonMonoxide.getGas(1000), - MaterialsKevlar.NickelTetracarbonyl.getFluid(100), - Materials.Water.getFluid(1000) - }, - new FluidStack[] {new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.Ethylene.getGas(1000), Materials.CarbonMonoxide.getGas(1000), + MaterialsKevlar.NickelTetracarbonyl.getFluid(100), Materials.Water.getFluid(1000) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000) }, null, 200, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] { - Materials.Ethylene.getGas(9000), - Materials.CarbonMonoxide.getGas(9000), - MaterialsKevlar.NickelTetracarbonyl.getFluid(900), - Materials.Water.getFluid(9000) - }, - new FluidStack[] {new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.Ethylene.getGas(9000), Materials.CarbonMonoxide.getGas(9000), + MaterialsKevlar.NickelTetracarbonyl.getFluid(900), Materials.Water.getFluid(9000) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000) }, null, 1500, 1920); // C6H7N + HNO3 =H2SO4,C4H6O3= C6H6N2O2 + H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("aniline"), 1000), - new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 100), - Materials.NitrationMixture.getFluid(2000) - }, - new FluidStack[] { - MaterialsKevlar.IVNitroaniline.getFluid(1000L), Materials.DilutedSulfuricAcid.getFluid(1000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("aniline"), 1000), + new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 100), + Materials.NitrationMixture.getFluid(2000) }, + new FluidStack[] { MaterialsKevlar.IVNitroaniline.getFluid(1000L), + Materials.DilutedSulfuricAcid.getFluid(1000) }, null, 300, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("aniline"), 9000), - new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 900), - Materials.NitrationMixture.getFluid(18000) - }, - new FluidStack[] { - MaterialsKevlar.IVNitroaniline.getFluid(9000L), Materials.DilutedSulfuricAcid.getFluid(9000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("aniline"), 9000), + new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 900), + Materials.NitrationMixture.getFluid(18000) }, + new FluidStack[] { MaterialsKevlar.IVNitroaniline.getFluid(9000L), + Materials.DilutedSulfuricAcid.getFluid(9000) }, null, 2000, 1920); // C6H6N2O2 + 6H =Pd,NO2= C6H8N2 + 2H2O GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1L) }, + new FluidStack[] { Materials.NitrogenDioxide.getGas(100), Materials.Hydrogen.getGas(6000), + MaterialsKevlar.IVNitroaniline.getFluid(1000L) }, + new FluidStack[] { Materials.Water.getFluid(2000L) }, new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1L) - }, - new FluidStack[] { - Materials.NitrogenDioxide.getGas(100), - Materials.Hydrogen.getGas(6000), - MaterialsKevlar.IVNitroaniline.getFluid(1000L) - }, - new FluidStack[] {Materials.Water.getFluid(2000L)}, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 16L) - }, + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 16L) }, 400, 500000); // C4H10O2 =Cu= C4H6O2 + 4H GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L) - }, - new FluidStack[] {new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)}, - new FluidStack[] {MaterialsKevlar.GammaButyrolactone.getFluid(1000), Materials.Hydrogen.getGas(4000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000) }, + new FluidStack[] { MaterialsKevlar.GammaButyrolactone.getFluid(1000), + Materials.Hydrogen.getGas(4000) }, null, 100, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 9L) - }, - new FluidStack[] {new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 9000)}, - new FluidStack[] { - MaterialsKevlar.GammaButyrolactone.getFluid(9000), Materials.Hydrogen.getGas(36000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 9L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 9000) }, + new FluidStack[] { MaterialsKevlar.GammaButyrolactone.getFluid(9000), + Materials.Hydrogen.getGas(36000) }, null, 700, 1920); // 2CH2O + C2H2 =SiO2,CuO,Bi2O3= C4H6O2 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L) - }, - new FluidStack[] { - MaterialsKevlar.Acetylene.getGas(1000L), - new FluidStack(FluidRegistry.getFluid("formaldehyde"), 2000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L) }, + new FluidStack[] { MaterialsKevlar.Acetylene.getGas(1000L), + new FluidStack(FluidRegistry.getFluid("formaldehyde"), 2000) }, null, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12L) }, 400, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 9L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 9L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9L) - }, - new FluidStack[] { - MaterialsKevlar.Acetylene.getGas(9000L), - new FluidStack(FluidRegistry.getFluid("formaldehyde"), 18000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 9L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 9L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9L) }, + new FluidStack[] { MaterialsKevlar.Acetylene.getGas(9000L), + new FluidStack(FluidRegistry.getFluid("formaldehyde"), 18000) }, null, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 44L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 44L) }, 3000, 1920); // C4H6O2 + 4H =NiAl= C4H10O2 - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 1L) - }, - new FluidStack[] {Materials.Hydrogen.getGas(4000L)}, - new FluidStack[] {new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)}, - null, - 300, - 500000); + GT_Values.RA + .addMultiblockChemicalRecipe( + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12L), + GT_OreDictUnificator + .get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 1L) }, + new FluidStack[] { Materials.Hydrogen.getGas(4000L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000) }, + null, + 300, + 500000); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - getModItem(MOD_ID_GTPP, "itemDustCalciumChloride", 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9L) - }, - new FluidStack[] {MaterialsKevlar.NMethylIIPyrrolidone.getFluid(1000)}, - new FluidStack[] { - MaterialsKevlar.LiquidCrystalKevlar.getFluid(9000L), - Materials.DilutedHydrochloricAcid.getFluid(2000L) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + getModItem(MOD_ID_GTPP, "itemDustCalciumChloride", 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9L) }, + new FluidStack[] { MaterialsKevlar.NMethylIIPyrrolidone.getFluid(1000) }, + new FluidStack[] { MaterialsKevlar.LiquidCrystalKevlar.getFluid(9000L), + Materials.DilutedHydrochloricAcid.getFluid(2000L) }, null, 600, 500000); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - getModItem(MOD_ID_GTPP, "itemDustCalciumChloride", 7L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63L) - }, - new FluidStack[] {MaterialsKevlar.NMethylIIPyrrolidone.getFluid(7000)}, - new FluidStack[] { - MaterialsKevlar.LiquidCrystalKevlar.getFluid(63000L), - Materials.DilutedHydrochloricAcid.getFluid(14000L) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + getModItem(MOD_ID_GTPP, "itemDustCalciumChloride", 7L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63L) }, + new FluidStack[] { MaterialsKevlar.NMethylIIPyrrolidone.getFluid(7000) }, + new FluidStack[] { MaterialsKevlar.LiquidCrystalKevlar.getFluid(63000L), + Materials.DilutedHydrochloricAcid.getFluid(14000L) }, null, 3500, 500000); // Na2B4O7(H2O)10 + 2HCl = 2NaCl + 4H3BO3 + 5H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Borax, 23L) - }, - new FluidStack[] {Materials.HydrochloricAcid.getFluid(2000L)}, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("boricacid"), 4000), Materials.Water.getFluid(5000L) - }, - new ItemStack[] {Materials.Salt.getDust(4)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Borax, 23L) }, + new FluidStack[] { Materials.HydrochloricAcid.getFluid(2000L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("boricacid"), 4000), + Materials.Water.getFluid(5000L) }, + new ItemStack[] { Materials.Salt.getDust(4) }, 800, 480); // H3BO3 + 3CH4O =H2SO4= C3H9BO3 + 3H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.Methanol.getFluid(3000L), - new FluidStack(FluidRegistry.getFluid("boricacid"), 1000), - Materials.SulfuricAcid.getFluid(6000L) - }, - new FluidStack[] { - Materials.DilutedSulfuricAcid.getFluid(6000L), MaterialsKevlar.TrimethylBorate.getFluid(1000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.Methanol.getFluid(3000L), + new FluidStack(FluidRegistry.getFluid("boricacid"), 1000), + Materials.SulfuricAcid.getFluid(6000L) }, + new FluidStack[] { Materials.DilutedSulfuricAcid.getFluid(6000L), + MaterialsKevlar.TrimethylBorate.getFluid(1000) }, null, 600, 960); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] { - Materials.Methanol.getFluid(27000L), - new FluidStack(FluidRegistry.getFluid("boricacid"), 9000), - Materials.SulfuricAcid.getFluid(54000L) - }, - new FluidStack[] { - Materials.DilutedSulfuricAcid.getFluid(54000L), MaterialsKevlar.TrimethylBorate.getFluid(9000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.Methanol.getFluid(27000L), + new FluidStack(FluidRegistry.getFluid("boricacid"), 9000), + Materials.SulfuricAcid.getFluid(54000L) }, + new FluidStack[] { Materials.DilutedSulfuricAcid.getFluid(54000L), + MaterialsKevlar.TrimethylBorate.getFluid(9000) }, null, 4500, 960); // RhCl3 + 3C18H15P + 3NaBH4 + CO = RhC55H46P3O + 3NaCl + 3B + 11H GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RhodiumChloride, 4L), - MaterialsKevlar.Triphenylphosphene.getDust(64), - MaterialsKevlar.Triphenylphosphene.getDust(38), - MaterialsKevlar.SodiumBorohydride.getDust(18) - }, - new FluidStack[] {Materials.CarbonMonoxide.getGas(1000L)}, - new FluidStack[] {Materials.Hydrogen.getGas(11000L)}, - new ItemStack[] { - MaterialsKevlar.OrganorhodiumCatalyst.getDust(64), - MaterialsKevlar.OrganorhodiumCatalyst.getDust(42), - Materials.Salt.getDust(6), - Materials.Boron.getDust(3) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RhodiumChloride, 4L), + MaterialsKevlar.Triphenylphosphene.getDust(64), + MaterialsKevlar.Triphenylphosphene.getDust(38), + MaterialsKevlar.SodiumBorohydride.getDust(18) }, + new FluidStack[] { Materials.CarbonMonoxide.getGas(1000L) }, + new FluidStack[] { Materials.Hydrogen.getGas(11000L) }, + new ItemStack[] { MaterialsKevlar.OrganorhodiumCatalyst.getDust(64), + MaterialsKevlar.OrganorhodiumCatalyst.getDust(42), Materials.Salt.getDust(6), + Materials.Boron.getDust(3) }, 800, 500000); // 2NaOH + N2H4 =Mn= 2N + 2H2O + 2NaH GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), - Materials.SodiumHydroxide.getDust(6), - Materials.Manganese.getDustTiny(1) - }, - new FluidStack[] {new FluidStack(FluidRegistry.getFluid("hydrazine"), 1000)}, - new FluidStack[] {Materials.Nitrogen.getGas(2000L), Materials.Water.getFluid(2000L)}, - new ItemStack[] {MaterialsKevlar.SodiumHydride.getDust(4)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), Materials.SodiumHydroxide.getDust(6), + Materials.Manganese.getDustTiny(1) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("hydrazine"), 1000) }, + new FluidStack[] { Materials.Nitrogen.getGas(2000L), Materials.Water.getFluid(2000L) }, + new ItemStack[] { MaterialsKevlar.SodiumHydride.getDust(4) }, 10, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(18), - Materials.SodiumHydroxide.getDust(54), - Materials.Manganese.getDust(1) - }, - new FluidStack[] {new FluidStack(FluidRegistry.getFluid("hydrazine"), 9000)}, - new FluidStack[] {Materials.Nitrogen.getGas(18000L), Materials.Water.getFluid(18000L)}, - new ItemStack[] {MaterialsKevlar.SodiumHydride.getDust(36)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(18), Materials.SodiumHydroxide.getDust(54), + Materials.Manganese.getDust(1) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("hydrazine"), 9000) }, + new FluidStack[] { Materials.Nitrogen.getGas(18000L), Materials.Water.getFluid(18000L) }, + new ItemStack[] { MaterialsKevlar.SodiumHydride.getDust(36) }, 70, 1920); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java index 1c951dbff0..a65945145b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java @@ -5,187 +5,157 @@ import static gregtech.api.enums.GT_Values.MOD_ID_RC; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isRailcraftLoaded; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.item.ItemStack; public class CircuitAssemblerRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Copper, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Copper, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 0), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.AnnealedCopper, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.AnnealedCopper, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 0), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Tin, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Tin, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 1), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Bronze, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Bronze, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 2), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iron, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iron, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 3), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 3), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Gold, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Gold, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 4), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Diamond, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Diamond, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 5), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - getModItem(MOD_ID_DC, "item.LongObsidianRod", 2L, 0) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + getModItem(MOD_ID_DC, "item.LongObsidianRod", 2L, 0) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 6), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Blaze, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Blaze, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 7), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Rubber, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Rubber, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 8), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Emerald, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Emerald, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 9), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Apatite, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Apatite, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 10), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Lapis, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Lapis, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 11), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.EnderEye, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.EnderEye, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 12), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Uranium, 2L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Uranium, 2L) }, Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 13), 200, @@ -194,97 +164,78 @@ public class CircuitAssemblerRecipes implements Runnable { if (!isRailcraftLoaded) return; for (Materials tMat : Materials.values()) { if (tMat.isProperSolderingFluid()) { - int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) - ? 1 + int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; // Railcraft Circuits GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Coated_Basic.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), - ItemList.Cover_Controller.get(1L) - }, + new ItemStack[] { ItemList.Circuit_Board_Coated_Basic.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + ItemList.Cover_Controller.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 4L, 0), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Coated_Basic.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), - ItemList.Sensor_LV.get(1L) - }, + new ItemStack[] { ItemList.Circuit_Board_Coated_Basic.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + ItemList.Sensor_LV.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 4L, 1), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Coated_Basic.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), - getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) - }, + new ItemStack[] { ItemList.Circuit_Board_Coated_Basic.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) }, tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 4L, 2), 300, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Phenolic_Good.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - ItemList.Cover_Controller.get(1L) - }, + new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + ItemList.Cover_Controller.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 8L, 0), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Phenolic_Good.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - ItemList.Sensor_LV.get(1L) - }, + new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + ItemList.Sensor_LV.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 8L, 1), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Phenolic_Good.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) - }, + new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) }, tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 8L, 2), 400, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Epoxy_Advanced.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), - ItemList.Cover_Controller.get(1L) - }, + new ItemStack[] { ItemList.Circuit_Board_Epoxy_Advanced.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), + ItemList.Cover_Controller.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 16L, 0), 500, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Epoxy_Advanced.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), - ItemList.Sensor_LV.get(1L) - }, + new ItemStack[] { ItemList.Circuit_Board_Epoxy_Advanced.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), + ItemList.Sensor_LV.get(1L) }, tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 16L, 1), 500, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Epoxy_Advanced.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), - getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) - }, + new ItemStack[] { ItemList.Circuit_Board_Epoxy_Advanced.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), + getModItem(MOD_ID_RC, "part.signal.lamp", 1L, 0) }, tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 16L, 2), 500, @@ -294,57 +245,48 @@ public class CircuitAssemblerRecipes implements Runnable { for (Materials tMat : Materials.values()) { if (tMat.isProperSolderingFluid()) { - int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) - ? 1 + int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Coated_Basic.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Primitive, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Circuit_Board_Coated_Basic.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Primitive, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), getModItem("Forestry", "chipsets", 1L, 0), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Coated_Basic.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Circuit_Board_Coated_Basic.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), getModItem("Forestry", "chipsets", 1L, 1), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Phenolic_Good.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), getModItem("Forestry", "chipsets", 1L, 2), 200, (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Phenolic_Good.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), + GT_Utility.getIntegratedCircuit(1) }, tMat.getMolten(1152L * tMultiplier / 2L), getModItem("Forestry", "chipsets", 1L, 3), 200, diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java index 8ac4b388c4..c0fd11017d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java @@ -5,6 +5,13 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isEBXLLoaded; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isRailcraftLoaded; +import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; +import mods.railcraft.common.items.RailcraftToolItems; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -13,20 +20,20 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; -import mods.railcraft.common.items.RailcraftToolItems; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class CompressorRecipes implements Runnable { + @Override public void run() { GT_ModHandler.addCompressionRecipe( - getModItem(MOD_ID_GTPP, "blockRainforestOakSapling", 8, 0), ItemList.IC2_Plantball.get(1)); + getModItem(MOD_ID_GTPP, "blockRainforestOakSapling", 8, 0), + ItemList.IC2_Plantball.get(1)); GT_Values.RA.addCompressorRecipe( - ItemList.IC2_Compressed_Coal_Chunk.get(1L), ItemList.IC2_Industrial_Diamond.get(1L), 300, 2); + ItemList.IC2_Compressed_Coal_Chunk.get(1L), + ItemList.IC2_Industrial_Diamond.get(1L), + 300, + 2); GT_ModHandler.addCompressionRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1L), GT_ModHandler.getIC2Item("Uran238", 1L)); @@ -44,7 +51,8 @@ public class CompressorRecipes implements Runnable { GT_ModHandler.getIC2Item("smallPlutonium", 1L)); GT_ModHandler.addCompressionRecipe(new ItemStack(Blocks.ice, 2, 32767), new ItemStack(Blocks.packed_ice, 1, 0)); GT_ModHandler.addCompressionRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L), new ItemStack(Blocks.ice, 1, 0)); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L), + new ItemStack(Blocks.ice, 1, 0)); GT_ModHandler.addCompressionRecipe( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4L), getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockQuartz", 1L)); @@ -68,31 +76,44 @@ public class CompressorRecipes implements Runnable { if (isEBXLLoaded) { GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 0), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 0), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 1), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 1), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 2), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 2), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 3), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 3), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 4), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 4), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 5), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 5), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 6), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 6), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 7), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 7), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 0), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 0), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 1), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 1), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 2), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 2), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 3), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 3), + ItemList.IC2_Plantball.get(1)); GT_ModHandler.addCompressionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 4), ItemList.IC2_Plantball.get(1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 4), + ItemList.IC2_Plantball.get(1)); } if (isRailcraftLoaded) { GT_Values.RA.addCompressorRecipe(RailcraftToolItems.getCoalCoke(9), EnumCube.COKE_BLOCK.getItem(), 300, 2); diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java index 714ca596c1..b4913e52c5 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java @@ -1,5 +1,7 @@ package gregtech.loaders.postload.recipes; +import net.minecraft.item.ItemStack; + import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -7,9 +9,9 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class CropProcessingRecipes implements Runnable { + @Override public void run() { ItemStack tCrop; @@ -117,9 +119,7 @@ public class CropProcessingRecipes implements Runnable { GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), - aMaterial.mOreByProducts.isEmpty() - ? null - : aMaterial.mOreByProducts.get(0).getMolten(144), + aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 24); @@ -131,12 +131,11 @@ public class CropProcessingRecipes implements Runnable { (int) (aMaterial.getMass() * 128), 384); } else { - if (aMainOutput) - GT_Values.RA.addExtractorRecipe( - GT_Utility.copyAmount(9, tCrop), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1), - 300, - 18); + if (aMainOutput) GT_Values.RA.addExtractorRecipe( + GT_Utility.copyAmount(9, tCrop), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1), + 300, + 18); } } @@ -148,9 +147,7 @@ public class CropProcessingRecipes implements Runnable { GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), - aMaterial.mOreByProducts.isEmpty() - ? null - : aMaterial.mOreByProducts.get(0).getMolten(144), + aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 24); @@ -170,8 +167,8 @@ public class CropProcessingRecipes implements Runnable { } } - public void addProcess( - ItemStack tCrop, Materials aMaterial, Materials aMaterialOut, int chance, boolean aMainOutput) { + public void addProcess(ItemStack tCrop, Materials aMaterial, Materials aMaterialOut, int chance, + boolean aMainOutput) { if (tCrop == null || aMaterial == null || GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1) == null) return; if (GT_Mod.gregtechproxy.mNerfedCrops) { @@ -179,9 +176,7 @@ public class CropProcessingRecipes implements Runnable { GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), - aMaterialOut.mOreByProducts.isEmpty() - ? null - : aMaterialOut.mOreByProducts.get(0).getMolten(144), + aMaterialOut.mOreByProducts.isEmpty() ? null : aMaterialOut.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterialOut, 4), 96, 24); @@ -193,12 +188,11 @@ public class CropProcessingRecipes implements Runnable { (int) (aMaterial.getMass() * 128), 384); } else { - if (aMainOutput) - GT_Values.RA.addExtractorRecipe( - GT_Utility.copyAmount(16, tCrop), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), - 300, - 18); + if (aMainOutput) GT_Values.RA.addExtractorRecipe( + GT_Utility.copyAmount(16, tCrop), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), + 300, + 18); } } @@ -210,9 +204,7 @@ public class CropProcessingRecipes implements Runnable { GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), - aMaterialOut.mOreByProducts.isEmpty() - ? null - : aMaterialOut.mOreByProducts.get(0).getMolten(144), + aMaterialOut.mOreByProducts.isEmpty() ? null : aMaterialOut.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterialOut, 4), 96, 24); diff --git a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java index 1bdd2d7fe2..8371f13158 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java @@ -3,65 +3,55 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isForestryloaded; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import codechicken.nei.api.API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class CuttingRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addCutterRecipe( - new ItemStack[] {ItemList.Circuit_Silicon_Ingot.get(1)}, - new ItemStack[] { - ItemList.Circuit_Silicon_Wafer.get(16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 4L) - }, + new ItemStack[] { ItemList.Circuit_Silicon_Ingot.get(1) }, + new ItemStack[] { ItemList.Circuit_Silicon_Wafer.get(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 4L) }, 400, (int) TierEU.RECIPE_LV, false); GT_Values.RA.addCutterRecipe( - new ItemStack[] {ItemList.Circuit_Silicon_Ingot2.get(1)}, - new ItemStack[] { - ItemList.Circuit_Silicon_Wafer2.get(32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 8L) - }, + new ItemStack[] { ItemList.Circuit_Silicon_Ingot2.get(1) }, + new ItemStack[] { ItemList.Circuit_Silicon_Wafer2.get(32), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 8L) }, 800, (int) TierEU.RECIPE_MV, true); GT_Values.RA.addCutterRecipe( - new ItemStack[] {ItemList.Circuit_Silicon_Ingot3.get(1)}, - new ItemStack[] { - ItemList.Circuit_Silicon_Wafer3.get(64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 16L) - }, + new ItemStack[] { ItemList.Circuit_Silicon_Ingot3.get(1) }, + new ItemStack[] { ItemList.Circuit_Silicon_Wafer3.get(64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 16L) }, 1600, (int) TierEU.RECIPE_HV, true); GT_Values.RA.addCutterRecipe( - new ItemStack[] {ItemList.Circuit_Silicon_Ingot4.get(1)}, - new ItemStack[] { - ItemList.Circuit_Silicon_Wafer4.get(64), - ItemList.Circuit_Silicon_Wafer4.get(32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 32L) - }, + new ItemStack[] { ItemList.Circuit_Silicon_Ingot4.get(1) }, + new ItemStack[] { ItemList.Circuit_Silicon_Wafer4.get(64), ItemList.Circuit_Silicon_Wafer4.get(32), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 32L) }, 2400, (int) TierEU.RECIPE_EV, true); GT_Values.RA.addCutterRecipe( - new ItemStack[] {ItemList.Circuit_Silicon_Ingot5.get(1)}, - new ItemStack[] { - ItemList.Circuit_Silicon_Wafer5.get(64), - ItemList.Circuit_Silicon_Wafer5.get(64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 64L) - }, + new ItemStack[] { ItemList.Circuit_Silicon_Ingot5.get(1) }, + new ItemStack[] { ItemList.Circuit_Silicon_Wafer5.get(64), ItemList.Circuit_Silicon_Wafer5.get(64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 64L) }, 3200, (int) TierEU.RECIPE_IV, true); @@ -88,7 +78,11 @@ public class CuttingRecipes implements Runnable { 8); } GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.glass, 3, 0), new ItemStack(Blocks.glass_pane, 8, 0), GT_Values.NI, 50, 8); + new ItemStack(Blocks.glass, 3, 0), + new ItemStack(Blocks.glass_pane, 8, 0), + GT_Values.NI, + 50, + 8); GT_Values.RA.addCutterRecipe( getModItem("TConstruct", "GlassBlock", 3L, 0), getModItem("TConstruct", "GlassPane", 8L, 0), @@ -96,17 +90,41 @@ public class CuttingRecipes implements Runnable { 50, 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.stone_slab, 2, 0), GT_Values.NI, 25, 8); + new ItemStack(Blocks.stone, 1, 0), + new ItemStack(Blocks.stone_slab, 2, 0), + GT_Values.NI, + 25, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.sandstone, 1, 0), new ItemStack(Blocks.stone_slab, 2, 1), GT_Values.NI, 25, 8); + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.stone_slab, 2, 1), + GT_Values.NI, + 25, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.cobblestone, 1, 0), new ItemStack(Blocks.stone_slab, 2, 3), GT_Values.NI, 25, 8); + new ItemStack(Blocks.cobblestone, 1, 0), + new ItemStack(Blocks.stone_slab, 2, 3), + GT_Values.NI, + 25, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.brick_block, 1, 0), new ItemStack(Blocks.stone_slab, 2, 4), GT_Values.NI, 25, 8); + new ItemStack(Blocks.brick_block, 1, 0), + new ItemStack(Blocks.stone_slab, 2, 4), + GT_Values.NI, + 25, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stone_slab, 2, 5), GT_Values.NI, 25, 8); + new ItemStack(Blocks.stonebrick, 1, 0), + new ItemStack(Blocks.stone_slab, 2, 5), + GT_Values.NI, + 25, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.nether_brick, 1, 0), new ItemStack(Blocks.stone_slab, 2, 6), GT_Values.NI, 25, 8); + new ItemStack(Blocks.nether_brick, 1, 0), + new ItemStack(Blocks.stone_slab, 2, 6), + GT_Values.NI, + 25, + 8); GT_Values.RA.addCutterRecipe( new ItemStack(Blocks.quartz_block, 1, 32767), new ItemStack(Blocks.stone_slab, 2, 7), @@ -122,47 +140,58 @@ public class CuttingRecipes implements Runnable { for (byte i = 0; i < 16; i = (byte) (i + 1)) { GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.wool, 1, i), new ItemStack(Blocks.carpet, 2, i), GT_Values.NI, 50, 8); + new ItemStack(Blocks.wool, 1, i), + new ItemStack(Blocks.carpet, 2, i), + GT_Values.NI, + 50, + 8); } GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.wooden_slab, 1, 0), ItemList.Plank_Oak.get(2L), GT_Values.NI, 50, 8); + new ItemStack(Blocks.wooden_slab, 1, 0), + ItemList.Plank_Oak.get(2L), + GT_Values.NI, + 50, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.wooden_slab, 1, 1), ItemList.Plank_Spruce.get(2L), GT_Values.NI, 50, 8); + new ItemStack(Blocks.wooden_slab, 1, 1), + ItemList.Plank_Spruce.get(2L), + GT_Values.NI, + 50, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.wooden_slab, 1, 2), ItemList.Plank_Birch.get(2L), GT_Values.NI, 50, 8); + new ItemStack(Blocks.wooden_slab, 1, 2), + ItemList.Plank_Birch.get(2L), + GT_Values.NI, + 50, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.wooden_slab, 1, 3), ItemList.Plank_Jungle.get(2L), GT_Values.NI, 50, 8); + new ItemStack(Blocks.wooden_slab, 1, 3), + ItemList.Plank_Jungle.get(2L), + GT_Values.NI, + 50, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.wooden_slab, 1, 4), ItemList.Plank_Acacia.get(2L), GT_Values.NI, 50, 8); + new ItemStack(Blocks.wooden_slab, 1, 4), + ItemList.Plank_Acacia.get(2L), + GT_Values.NI, + 50, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(Blocks.wooden_slab, 1, 5), ItemList.Plank_DarkOak.get(2L), GT_Values.NI, 50, 8); + new ItemStack(Blocks.wooden_slab, 1, 5), + ItemList.Plank_DarkOak.get(2L), + GT_Values.NI, + 50, + 8); - ItemStack[] coverIDs = { - ItemList.Plank_Larch.get(2L), - ItemList.Plank_Teak.get(2L), - ItemList.Plank_Acacia_Green.get(2L), - ItemList.Plank_Lime.get(2L), - ItemList.Plank_Chestnut.get(2L), - ItemList.Plank_Wenge.get(2L), - ItemList.Plank_Baobab.get(2L), - ItemList.Plank_Sequoia.get(2L), - ItemList.Plank_Kapok.get(2L), - ItemList.Plank_Ebony.get(2L), - ItemList.Plank_Mahagony.get(2L), - ItemList.Plank_Balsa.get(2L), - ItemList.Plank_Willow.get(2L), - ItemList.Plank_Walnut.get(2L), - ItemList.Plank_Greenheart.get(2L), - ItemList.Plank_Cherry.get(2L), - ItemList.Plank_Mahoe.get(2L), - ItemList.Plank_Poplar.get(2L), - ItemList.Plank_Palm.get(2L), - ItemList.Plank_Papaya.get(2L), - ItemList.Plank_Pine.get(2L), - ItemList.Plank_Plum.get(2L), - ItemList.Plank_Maple.get(2L), - ItemList.Plank_Citrus.get(2L) - }; + ItemStack[] coverIDs = { ItemList.Plank_Larch.get(2L), ItemList.Plank_Teak.get(2L), + ItemList.Plank_Acacia_Green.get(2L), ItemList.Plank_Lime.get(2L), ItemList.Plank_Chestnut.get(2L), + ItemList.Plank_Wenge.get(2L), ItemList.Plank_Baobab.get(2L), ItemList.Plank_Sequoia.get(2L), + ItemList.Plank_Kapok.get(2L), ItemList.Plank_Ebony.get(2L), ItemList.Plank_Mahagony.get(2L), + ItemList.Plank_Balsa.get(2L), ItemList.Plank_Willow.get(2L), ItemList.Plank_Walnut.get(2L), + ItemList.Plank_Greenheart.get(2L), ItemList.Plank_Cherry.get(2L), ItemList.Plank_Mahoe.get(2L), + ItemList.Plank_Poplar.get(2L), ItemList.Plank_Palm.get(2L), ItemList.Plank_Papaya.get(2L), + ItemList.Plank_Pine.get(2L), ItemList.Plank_Plum.get(2L), ItemList.Plank_Maple.get(2L), + ItemList.Plank_Citrus.get(2L) }; int i = 0; for (ItemStack cover : coverIDs) { if (isForestryloaded) { @@ -171,11 +200,11 @@ public class CuttingRecipes implements Runnable { GT_ModHandler.addCraftingRecipe( cover, GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] {"s ", " P", 'P', slabWood}); + new Object[] { "s ", " P", 'P', slabWood }); GT_ModHandler.addCraftingRecipe( cover, GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] {"s ", " P", 'P', slabWoodFireproof}); + new Object[] { "s ", " P", 'P', slabWoodFireproof }); GT_Values.RA.addCutterRecipe(slabWood, cover, null, 40, 8); GT_Values.RA.addCutterRecipe(slabWoodFireproof, cover, null, 40, 8); } else if (GT_MachineRecipeLoader.isNEILoaded) { diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java index 5a8f25990b..a4828c6696 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java @@ -3,16 +3,18 @@ package gregtech.loaders.postload.recipes; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isTinkersConstructLoaded; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class DistilleryRecipes implements Runnable { + @Override public void run() { @@ -135,7 +137,12 @@ public class DistilleryRecipes implements Runnable { false); GT_Values.RA.addDistilleryRecipe( - 6, Materials.WoodTar.getFluid(200), MaterialsKevlar.IIIDimethylbenzene.getFluid(30), 16, 64, false); + 6, + Materials.WoodTar.getFluid(200), + MaterialsKevlar.IIIDimethylbenzene.getFluid(30), + 16, + 64, + false); GT_Values.RA.addDistilleryRecipe( 6, Materials.CharcoalByproducts.getGas(200), @@ -144,7 +151,12 @@ public class DistilleryRecipes implements Runnable { 64, false); GT_Values.RA.addDistilleryRecipe( - 7, Materials.WoodTar.getFluid(200), MaterialsKevlar.IVDimethylbenzene.getFluid(30), 16, 64, false); + 7, + Materials.WoodTar.getFluid(200), + MaterialsKevlar.IVDimethylbenzene.getFluid(30), + 16, + 64, + false); GT_Values.RA.addDistilleryRecipe( 7, Materials.CharcoalByproducts.getGas(200), @@ -238,15 +250,35 @@ public class DistilleryRecipes implements Runnable { false); GT_Values.RA.addDistilleryRecipe( - 2, Materials.HeavyFuel.getFluid(100), Materials.Benzene.getFluid(40), 160, 24, false); + 2, + Materials.HeavyFuel.getFluid(100), + Materials.Benzene.getFluid(40), + 160, + 24, + false); GT_Values.RA.addDistilleryRecipe( - 3, Materials.HeavyFuel.getFluid(100), Materials.Phenol.getFluid(25), 160, 24, false); + 3, + Materials.HeavyFuel.getFluid(100), + Materials.Phenol.getFluid(25), + 160, + 24, + false); // Dimethylbenzene GT_Values.RA.addDistilleryRecipe( - 5, Materials.WoodTar.getFluid(200), Materials.Dimethylbenzene.getFluid(30), 100, 120, false); + 5, + Materials.WoodTar.getFluid(200), + Materials.Dimethylbenzene.getFluid(30), + 100, + 120, + false); GT_Values.RA.addDistilleryRecipe( - 5, Materials.CharcoalByproducts.getGas(200), Materials.Dimethylbenzene.getFluid(20), 100, 120, false); + 5, + Materials.CharcoalByproducts.getGas(200), + Materials.Dimethylbenzene.getFluid(20), + 100, + 120, + false); GT_Values.RA.addDistilleryRecipe( GT_Utility.getIntegratedCircuit(1), @@ -309,55 +341,55 @@ public class DistilleryRecipes implements Runnable { GT_Values.RA.addDistillationTowerRecipe( Materials.Creosote.getFluid(1000L), - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] {Materials.Lubricant.getFluid(500L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Lubricant.getFluid(500L) }, null, 400, 120); GT_Values.RA.addDistillationTowerRecipe( Materials.SeedOil.getFluid(1400L), - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] {Materials.Lubricant.getFluid(500L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Lubricant.getFluid(500L) }, null, 400, 120); GT_Values.RA.addDistillationTowerRecipe( Materials.FishOil.getFluid(1200L), - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] {Materials.Lubricant.getFluid(500L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Lubricant.getFluid(500L) }, null, 400, 120); GT_Values.RA.addDistillationTowerRecipe( Materials.Biomass.getFluid(1000L), - new FluidStack[] {Materials.Ethanol.getFluid(600L), Materials.Water.getFluid(300L)}, + new FluidStack[] { Materials.Ethanol.getFluid(600L), Materials.Water.getFluid(300L) }, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L), 32, 400); GT_Values.RA.addDistillationTowerRecipe( Materials.Water.getFluid(1000L), - new FluidStack[] {GT_ModHandler.getDistilledWater(1000L)}, + new FluidStack[] { GT_ModHandler.getDistilledWater(1000L) }, null, 32, 120); GT_Values.RA.addDistillationTowerRecipe( Materials.OilLight.getFluid(1000L), - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] {Materials.Lubricant.getFluid(250L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Lubricant.getFluid(250L) }, null, 400, 120); GT_Values.RA.addDistillationTowerRecipe( Materials.OilMedium.getFluid(1000L), - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] {Materials.Lubricant.getFluid(500L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Lubricant.getFluid(500L) }, null, 400, 120); GT_Values.RA.addDistillationTowerRecipe( Materials.OilHeavy.getFluid(1000L), - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] {Materials.Lubricant.getFluid(750L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Lubricant.getFluid(750L) }, null, 400, 120); @@ -365,245 +397,171 @@ public class DistilleryRecipes implements Runnable { // C15H10N2O2(5HCl) = C15H10N2O2 + 5HCl GT_Values.RA.addDistillationTowerRecipe( MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000L), - new FluidStack[] {Materials.HydrochloricAcid.getFluid(5000L)}, + new FluidStack[] { Materials.HydrochloricAcid.getFluid(5000L) }, GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 29L), 2500, 1920); GT_Values.RA.addDistillationTowerRecipe( Materials.CharcoalByproducts.getGas(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] { - Materials.WoodTar.getFluid(250), - Materials.WoodVinegar.getFluid(400), - Materials.WoodGas.getGas(250), - MaterialsKevlar.IIIDimethylbenzene.getFluid(100) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.WoodTar.getFluid(250), Materials.WoodVinegar.getFluid(400), + Materials.WoodGas.getGas(250), MaterialsKevlar.IIIDimethylbenzene.getFluid(100) }, Materials.Charcoal.getDustSmall(1), 40, 256); GT_Values.RA.addDistillationTowerRecipe( Materials.WoodTar.getFluid(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] { - Materials.Creosote.getFluid(250), - Materials.Phenol.getFluid(100), - Materials.Benzene.getFluid(400), - Materials.Toluene.getFluid(100), - MaterialsKevlar.IIIDimethylbenzene.getFluid(150) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Creosote.getFluid(250), Materials.Phenol.getFluid(100), + Materials.Benzene.getFluid(400), Materials.Toluene.getFluid(100), + MaterialsKevlar.IIIDimethylbenzene.getFluid(150) }, GT_Values.NI, 40, 256); GT_Values.RA.addDistillationTowerRecipe( Materials.CharcoalByproducts.getGas(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(3)}, - new FluidStack[] { - Materials.WoodTar.getFluid(250), - Materials.WoodVinegar.getFluid(400), - Materials.WoodGas.getGas(250), - MaterialsKevlar.IVDimethylbenzene.getFluid(100) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(3) }, + new FluidStack[] { Materials.WoodTar.getFluid(250), Materials.WoodVinegar.getFluid(400), + Materials.WoodGas.getGas(250), MaterialsKevlar.IVDimethylbenzene.getFluid(100) }, Materials.Charcoal.getDustSmall(1), 40, 256); GT_Values.RA.addDistillationTowerRecipe( Materials.CharcoalByproducts.getGas(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(4)}, - new FluidStack[] { - Materials.WoodTar.getFluid(250), - Materials.WoodVinegar.getFluid(400), - Materials.WoodGas.getGas(250), - Materials.Dimethylbenzene.getFluid(20), - MaterialsKevlar.IIIDimethylbenzene.getFluid(60), - MaterialsKevlar.IVDimethylbenzene.getFluid(20) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(4) }, + new FluidStack[] { Materials.WoodTar.getFluid(250), Materials.WoodVinegar.getFluid(400), + Materials.WoodGas.getGas(250), Materials.Dimethylbenzene.getFluid(20), + MaterialsKevlar.IIIDimethylbenzene.getFluid(60), + MaterialsKevlar.IVDimethylbenzene.getFluid(20) }, Materials.Charcoal.getDustSmall(1), 40, 256); GT_Values.RA.addDistillationTowerRecipe( Materials.WoodTar.getFluid(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(4)}, - new FluidStack[] { - Materials.Creosote.getFluid(250), - Materials.Phenol.getFluid(100), - Materials.Benzene.getFluid(400), - Materials.Toluene.getFluid(100), - Materials.Dimethylbenzene.getFluid(30), - MaterialsKevlar.IIIDimethylbenzene.getFluid(90), - MaterialsKevlar.IVDimethylbenzene.getFluid(30) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(4) }, + new FluidStack[] { Materials.Creosote.getFluid(250), Materials.Phenol.getFluid(100), + Materials.Benzene.getFluid(400), Materials.Toluene.getFluid(100), + Materials.Dimethylbenzene.getFluid(30), MaterialsKevlar.IIIDimethylbenzene.getFluid(90), + MaterialsKevlar.IVDimethylbenzene.getFluid(30) }, GT_Values.NI, 40, 256); GT_Values.RA.addDistillationTowerRecipe( Materials.OilLight.getFluid(1500), - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] { - Materials.SulfuricHeavyFuel.getFluid(100), - Materials.SulfuricLightFuel.getFluid(200), - Materials.SulfuricNaphtha.getFluid(300), - MaterialsKevlar.NaphthenicAcid.getFluid(25), - Materials.SulfuricGas.getGas(2400) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(100), Materials.SulfuricLightFuel.getFluid(200), + Materials.SulfuricNaphtha.getFluid(300), MaterialsKevlar.NaphthenicAcid.getFluid(25), + Materials.SulfuricGas.getGas(2400) }, null, 32, 480); GT_Values.RA.addDistillationTowerRecipe( Materials.OilMedium.getFluid(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] { - Materials.SulfuricHeavyFuel.getFluid(100), - Materials.SulfuricLightFuel.getFluid(500), - Materials.SulfuricNaphtha.getFluid(1500), - MaterialsKevlar.NaphthenicAcid.getFluid(25), - Materials.SulfuricGas.getGas(600) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(100), Materials.SulfuricLightFuel.getFluid(500), + Materials.SulfuricNaphtha.getFluid(1500), MaterialsKevlar.NaphthenicAcid.getFluid(25), + Materials.SulfuricGas.getGas(600) }, null, 32, 480); GT_Values.RA.addDistillationTowerRecipe( Materials.Oil.getFluid(500L), - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] { - Materials.SulfuricHeavyFuel.getFluid(150), - Materials.SulfuricLightFuel.getFluid(500), - Materials.SulfuricNaphtha.getFluid(200), - MaterialsKevlar.NaphthenicAcid.getFluid(25), - Materials.SulfuricGas.getGas(600) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(150), Materials.SulfuricLightFuel.getFluid(500), + Materials.SulfuricNaphtha.getFluid(200), MaterialsKevlar.NaphthenicAcid.getFluid(25), + Materials.SulfuricGas.getGas(600) }, null, 32, 480); GT_Values.RA.addDistillationTowerRecipe( Materials.OilHeavy.getFluid(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] { - Materials.SulfuricHeavyFuel.getFluid(2500), - Materials.SulfuricLightFuel.getFluid(450), - Materials.SulfuricNaphtha.getFluid(150), - MaterialsKevlar.NaphthenicAcid.getFluid(50), - Materials.SulfuricGas.getGas(600) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(2500), + Materials.SulfuricLightFuel.getFluid(450), Materials.SulfuricNaphtha.getFluid(150), + MaterialsKevlar.NaphthenicAcid.getFluid(50), Materials.SulfuricGas.getGas(600) }, null, 100, 480); GT_Values.RA.addUniversalDistillationRecipewithCircuit( Materials.WoodTar.getFluid(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(3)}, - new FluidStack[] { - Materials.Creosote.getFluid(250), - Materials.Phenol.getFluid(100), - Materials.Benzene.getFluid(400), - Materials.Toluene.getFluid(100), - MaterialsKevlar.IVDimethylbenzene.getFluid(150) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(3) }, + new FluidStack[] { Materials.Creosote.getFluid(250), Materials.Phenol.getFluid(100), + Materials.Benzene.getFluid(400), Materials.Toluene.getFluid(100), + MaterialsKevlar.IVDimethylbenzene.getFluid(150) }, GT_Values.NI, 40, 256); GT_Values.RA.addUniversalDistillationRecipewithCircuit( Materials.CharcoalByproducts.getGas(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.WoodTar.getFluid(250), - Materials.WoodVinegar.getFluid(400), - Materials.WoodGas.getGas(250), - Materials.Dimethylbenzene.getFluid(100) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.WoodTar.getFluid(250), Materials.WoodVinegar.getFluid(400), + Materials.WoodGas.getGas(250), Materials.Dimethylbenzene.getFluid(100) }, Materials.Charcoal.getDustSmall(1), 40, 256); GT_Values.RA.addUniversalDistillationRecipewithCircuit( Materials.WoodGas.getGas(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.CarbonDioxide.getGas(390), - Materials.Ethylene.getGas(120), - Materials.Methane.getGas(130), - Materials.CarbonMonoxide.getGas(240), - Materials.Hydrogen.getGas(120) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.CarbonDioxide.getGas(390), Materials.Ethylene.getGas(120), + Materials.Methane.getGas(130), Materials.CarbonMonoxide.getGas(240), + Materials.Hydrogen.getGas(120) }, GT_Values.NI, 40, 256); GT_Values.RA.addUniversalDistillationRecipewithCircuit( Materials.WoodVinegar.getFluid(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.AceticAcid.getFluid(100), - Materials.Water.getFluid(500), - Materials.Ethanol.getFluid(10), - Materials.Methanol.getFluid(300), - Materials.Acetone.getFluid(50), - Materials.MethylAcetate.getFluid(10) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.AceticAcid.getFluid(100), Materials.Water.getFluid(500), + Materials.Ethanol.getFluid(10), Materials.Methanol.getFluid(300), + Materials.Acetone.getFluid(50), Materials.MethylAcetate.getFluid(10) }, GT_Values.NI, 40, 256); GT_Values.RA.addUniversalDistillationRecipewithCircuit( Materials.WoodTar.getFluid(1000), - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.Creosote.getFluid(250), - Materials.Phenol.getFluid(100), - Materials.Benzene.getFluid(400), - Materials.Toluene.getFluid(100), - Materials.Dimethylbenzene.getFluid(150) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.Creosote.getFluid(250), Materials.Phenol.getFluid(100), + Materials.Benzene.getFluid(400), Materials.Toluene.getFluid(100), + Materials.Dimethylbenzene.getFluid(150) }, GT_Values.NI, 40, 256); GT_Values.RA.addUniversalDistillationRecipewithCircuit( Materials.OilLight.getFluid(150), - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.SulfuricHeavyFuel.getFluid(10), - Materials.SulfuricLightFuel.getFluid(20), - Materials.SulfuricNaphtha.getFluid(30), - Materials.SulfuricGas.getGas(240) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(10), Materials.SulfuricLightFuel.getFluid(20), + Materials.SulfuricNaphtha.getFluid(30), Materials.SulfuricGas.getGas(240) }, null, 20, 96); GT_Values.RA.addUniversalDistillationRecipewithCircuit( Materials.OilMedium.getFluid(100), - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.SulfuricHeavyFuel.getFluid(10), - Materials.SulfuricLightFuel.getFluid(50), - Materials.SulfuricNaphtha.getFluid(150), - Materials.SulfuricGas.getGas(60) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(10), Materials.SulfuricLightFuel.getFluid(50), + Materials.SulfuricNaphtha.getFluid(150), Materials.SulfuricGas.getGas(60) }, null, 20, 96); GT_Values.RA.addUniversalDistillationRecipewithCircuit( Materials.Oil.getFluid(50L), - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.SulfuricHeavyFuel.getFluid(15), - Materials.SulfuricLightFuel.getFluid(50), - Materials.SulfuricNaphtha.getFluid(20), - Materials.SulfuricGas.getGas(60) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50), + Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60) }, null, 20, 96); GT_Values.RA.addUniversalDistillationRecipewithCircuit( Materials.OilHeavy.getFluid(100), - new ItemStack[] {GT_Utility.getIntegratedCircuit(1)}, - new FluidStack[] { - Materials.SulfuricHeavyFuel.getFluid(250), - Materials.SulfuricLightFuel.getFluid(45), - Materials.SulfuricNaphtha.getFluid(15), - Materials.SulfuricGas.getGas(60) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(250), Materials.SulfuricLightFuel.getFluid(45), + Materials.SulfuricNaphtha.getFluid(15), Materials.SulfuricGas.getGas(60) }, null, 20, 288); @@ -611,28 +569,28 @@ public class DistilleryRecipes implements Runnable { // 2 0.5HCl(Diluted) = HCl + H2O GT_Values.RA.addUniversalDistillationRecipe( Materials.DilutedHydrochloricAcid.getFluid(2000), - new FluidStack[] {Materials.Water.getFluid(1000), Materials.HydrochloricAcid.getFluid(1000)}, + new FluidStack[] { Materials.Water.getFluid(1000), Materials.HydrochloricAcid.getFluid(1000) }, GT_Values.NI, 600, 64); GT_Values.RA.addUniversalDistillationRecipe( getFluidStack("potion.vinegar", 40), - new FluidStack[] {Materials.AceticAcid.getFluid(5), Materials.Water.getFluid(35)}, + new FluidStack[] { Materials.AceticAcid.getFluid(5), Materials.Water.getFluid(35) }, GT_Values.NI, 20, 64); GT_Values.RA.addUniversalDistillationRecipe( Materials.CalciumAcetateSolution.getFluid(1000), - new FluidStack[] {Materials.Acetone.getFluid(1000), Materials.CarbonDioxide.getGas(1000)}, + new FluidStack[] { Materials.Acetone.getFluid(1000), Materials.CarbonDioxide.getGas(1000) }, Materials.Quicklime.getDust(2), 80, 480); GT_Values.RA.addUniversalDistillationRecipe( Materials.DilutedSulfuricAcid.getFluid(3000), - new FluidStack[] {Materials.SulfuricAcid.getFluid(2000), Materials.Water.getFluid(1000)}, + new FluidStack[] { Materials.SulfuricAcid.getFluid(2000), Materials.Water.getFluid(1000) }, GT_Values.NI, 600, 120); @@ -640,669 +598,485 @@ public class DistilleryRecipes implements Runnable { // C3H6O = C2H2O + CH4 GT_Values.RA.addUniversalDistillationRecipe( Materials.Acetone.getFluid(1000), - new FluidStack[] {Materials.Ethenone.getGas(1000), Materials.Methane.getGas(1000)}, + new FluidStack[] { Materials.Ethenone.getGas(1000), Materials.Methane.getGas(1000) }, GT_Values.NI, 80, 640); GT_Values.RA.addUniversalDistillationRecipe( Materials.Gas.getGas(1000), - new FluidStack[] { - Materials.Butane.getGas(60), - Materials.Propane.getGas(70), - Materials.Ethane.getGas(100), - Materials.Methane.getGas(750), - Materials.Helium.getGas(20) - }, + new FluidStack[] { Materials.Butane.getGas(60), Materials.Propane.getGas(70), + Materials.Ethane.getGas(100), Materials.Methane.getGas(750), Materials.Helium.getGas(20) }, GT_Values.NI, 240, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethylene.getLightlyHydroCracked(1000), - new FluidStack[] {Materials.Ethane.getGas(1000)}, + new FluidStack[] { Materials.Ethane.getGas(1000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethylene.getModeratelyHydroCracked(1000), - new FluidStack[] {Materials.Methane.getGas(2000)}, + new FluidStack[] { Materials.Methane.getGas(2000) }, null, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethylene.getSeverelyHydroCracked(1000), - new FluidStack[] {Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(2000)}, + new FluidStack[] { Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(2000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethylene.getLightlySteamCracked(1000), - new FluidStack[] {Materials.Methane.getGas(1000)}, + new FluidStack[] { Materials.Methane.getGas(1000) }, Materials.Carbon.getDust(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethylene.getModeratelySteamCracked(1000), - new FluidStack[] {Materials.Methane.getGas(1000)}, + new FluidStack[] { Materials.Methane.getGas(1000) }, Materials.Carbon.getDust(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethylene.getSeverelySteamCracked(1000), - new FluidStack[] {Materials.Methane.getGas(1000)}, + new FluidStack[] { Materials.Methane.getGas(1000) }, Materials.Carbon.getDust(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethane.getLightlyHydroCracked(1000), - new FluidStack[] {Materials.Methane.getGas(2000)}, + new FluidStack[] { Materials.Methane.getGas(2000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethane.getModeratelyHydroCracked(1000), - new FluidStack[] {Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(2000)}, + new FluidStack[] { Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(2000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethane.getSeverelyHydroCracked(1000), - new FluidStack[] {Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(4000)}, + new FluidStack[] { Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(4000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethane.getLightlySteamCracked(1000), - new FluidStack[] {Materials.Ethylene.getGas(250), Materials.Methane.getGas(1250)}, + new FluidStack[] { Materials.Ethylene.getGas(250), Materials.Methane.getGas(1250) }, Materials.Carbon.getDustSmall(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethane.getModeratelySteamCracked(1000), - new FluidStack[] {Materials.Ethylene.getGas(125), Materials.Methane.getGas(1375)}, + new FluidStack[] { Materials.Ethylene.getGas(125), Materials.Methane.getGas(1375) }, Materials.Carbon.getDustTiny(6), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Ethane.getSeverelySteamCracked(1000), - new FluidStack[] {Materials.Methane.getGas(1500)}, + new FluidStack[] { Materials.Methane.getGas(1500) }, Materials.Carbon.getDustSmall(2), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propene.getLightlyHydroCracked(1000), - new FluidStack[] { - Materials.Propane.getGas(500), Materials.Ethylene.getGas(500), Materials.Methane.getGas(500) - }, + new FluidStack[] { Materials.Propane.getGas(500), Materials.Ethylene.getGas(500), + Materials.Methane.getGas(500) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propene.getModeratelyHydroCracked(1000), - new FluidStack[] {Materials.Ethane.getGas(1000), Materials.Methane.getGas(1000)}, + new FluidStack[] { Materials.Ethane.getGas(1000), Materials.Methane.getGas(1000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propene.getSeverelyHydroCracked(1000), - new FluidStack[] {Materials.Methane.getGas(3000)}, + new FluidStack[] { Materials.Methane.getGas(3000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propene.getLightlySteamCracked(1000), - new FluidStack[] {Materials.Ethylene.getGas(1000), Materials.Methane.getGas(500)}, + new FluidStack[] { Materials.Ethylene.getGas(1000), Materials.Methane.getGas(500) }, Materials.Carbon.getDustSmall(2), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propene.getModeratelySteamCracked(1000), - new FluidStack[] {Materials.Ethylene.getGas(750), Materials.Methane.getGas(750)}, + new FluidStack[] { Materials.Ethylene.getGas(750), Materials.Methane.getGas(750) }, Materials.Carbon.getDustSmall(3), 180, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propene.getSeverelySteamCracked(1000), - new FluidStack[] {Materials.Methane.getGas(1500)}, + new FluidStack[] { Materials.Methane.getGas(1500) }, Materials.Carbon.getDustSmall(6), 180, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propane.getLightlyHydroCracked(1000), - new FluidStack[] {Materials.Ethane.getGas(1000), Materials.Methane.getGas(1000)}, + new FluidStack[] { Materials.Ethane.getGas(1000), Materials.Methane.getGas(1000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propane.getModeratelyHydroCracked(1000), - new FluidStack[] {Materials.Methane.getGas(3000)}, + new FluidStack[] { Materials.Methane.getGas(3000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propane.getSeverelyHydroCracked(1000), - new FluidStack[] {Materials.Methane.getGas(3000), Materials.Hydrogen.getGas(2000)}, + new FluidStack[] { Materials.Methane.getGas(3000), Materials.Hydrogen.getGas(2000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propane.getLightlySteamCracked(1000), - new FluidStack[] {Materials.Ethylene.getGas(750), Materials.Methane.getGas(1250)}, + new FluidStack[] { Materials.Ethylene.getGas(750), Materials.Methane.getGas(1250) }, Materials.Carbon.getDustTiny(2), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propane.getModeratelySteamCracked(1000), - new FluidStack[] {Materials.Ethylene.getGas(500), Materials.Methane.getGas(1500)}, + new FluidStack[] { Materials.Ethylene.getGas(500), Materials.Methane.getGas(1500) }, Materials.Carbon.getDustSmall(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Propane.getSeverelySteamCracked(1000), - new FluidStack[] {Materials.Ethylene.getGas(250), Materials.Methane.getGas(1750)}, + new FluidStack[] { Materials.Ethylene.getGas(250), Materials.Methane.getGas(1750) }, Materials.Carbon.getDustTiny(4), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butadiene.getLightlyHydroCracked(1000), - new FluidStack[] {Materials.Butene.getGas(667), Materials.Ethylene.getGas(667)}, + new FluidStack[] { Materials.Butene.getGas(667), Materials.Ethylene.getGas(667) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butadiene.getModeratelyHydroCracked(1000), - new FluidStack[] { - Materials.Butane.getGas(223), - Materials.Propene.getGas(223), - Materials.Ethane.getGas(400), - Materials.Ethylene.getGas(445), - Materials.Methane.getGas(223) - }, + new FluidStack[] { Materials.Butane.getGas(223), Materials.Propene.getGas(223), + Materials.Ethane.getGas(400), Materials.Ethylene.getGas(445), Materials.Methane.getGas(223) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butadiene.getSeverelyHydroCracked(1000), - new FluidStack[] { - Materials.Propane.getGas(260), - Materials.Ethane.getGas(926), - Materials.Ethylene.getGas(389), - Materials.Methane.getGas(2667) - }, + new FluidStack[] { Materials.Propane.getGas(260), Materials.Ethane.getGas(926), + Materials.Ethylene.getGas(389), Materials.Methane.getGas(2667) }, GT_Values.NI, 112, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butadiene.getLightlySteamCracked(1000), - new FluidStack[] { - Materials.Propene.getGas(750), Materials.Ethylene.getGas(188), Materials.Methane.getGas(188) - }, + new FluidStack[] { Materials.Propene.getGas(750), Materials.Ethylene.getGas(188), + Materials.Methane.getGas(188) }, Materials.Carbon.getDustSmall(3), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butadiene.getModeratelySteamCracked(1000), - new FluidStack[] { - Materials.Propene.getGas(125), Materials.Ethylene.getGas(1125), Materials.Methane.getGas(188) - }, + new FluidStack[] { Materials.Propene.getGas(125), Materials.Ethylene.getGas(1125), + Materials.Methane.getGas(188) }, Materials.Carbon.getDustSmall(3), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butadiene.getSeverelySteamCracked(1000), - new FluidStack[] { - Materials.Propene.getGas(125), Materials.Ethylene.getGas(188), Materials.Methane.getGas(1125) - }, + new FluidStack[] { Materials.Propene.getGas(125), Materials.Ethylene.getGas(188), + Materials.Methane.getGas(1125) }, Materials.Carbon.getDust(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butene.getLightlyHydroCracked(1000), - new FluidStack[] { - Materials.Butane.getGas(334), - Materials.Propene.getGas(334), - Materials.Ethane.getGas(334), - Materials.Ethylene.getGas(334), - Materials.Methane.getGas(334) - }, + new FluidStack[] { Materials.Butane.getGas(334), Materials.Propene.getGas(334), + Materials.Ethane.getGas(334), Materials.Ethylene.getGas(334), Materials.Methane.getGas(334) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butene.getModeratelyHydroCracked(1000), - new FluidStack[] { - Materials.Propane.getGas(389), - Materials.Ethane.getGas(556), - Materials.Ethylene.getGas(334), - Materials.Methane.getGas(1056) - }, + new FluidStack[] { Materials.Propane.getGas(389), Materials.Ethane.getGas(556), + Materials.Ethylene.getGas(334), Materials.Methane.getGas(1056) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butene.getSeverelyHydroCracked(1000), - new FluidStack[] {Materials.Ethane.getGas(1000), Materials.Methane.getGas(2000)}, + new FluidStack[] { Materials.Ethane.getGas(1000), Materials.Methane.getGas(2000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butene.getLightlySteamCracked(1000), - new FluidStack[] { - Materials.Propene.getGas(750), Materials.Ethylene.getGas(500), Materials.Methane.getGas(250) - }, + new FluidStack[] { Materials.Propene.getGas(750), Materials.Ethylene.getGas(500), + Materials.Methane.getGas(250) }, Materials.Carbon.getDustSmall(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butene.getModeratelySteamCracked(1000), - new FluidStack[] { - Materials.Propene.getGas(200), Materials.Ethylene.getGas(1300), Materials.Methane.getGas(400) - }, + new FluidStack[] { Materials.Propene.getGas(200), Materials.Ethylene.getGas(1300), + Materials.Methane.getGas(400) }, Materials.Carbon.getDustSmall(1), 192, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butene.getSeverelySteamCracked(1000), - new FluidStack[] { - Materials.Propene.getGas(125), Materials.Ethylene.getGas(313), Materials.Methane.getGas(1500) - }, + new FluidStack[] { Materials.Propene.getGas(125), Materials.Ethylene.getGas(313), + Materials.Methane.getGas(1500) }, Materials.Carbon.getDustSmall(6), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butane.getLightlyHydroCracked(1000), - new FluidStack[] { - Materials.Propane.getGas(667), Materials.Ethane.getGas(667), Materials.Methane.getGas(667) - }, + new FluidStack[] { Materials.Propane.getGas(667), Materials.Ethane.getGas(667), + Materials.Methane.getGas(667) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butane.getModeratelyHydroCracked(1000), - new FluidStack[] {Materials.Ethane.getGas(1000), Materials.Methane.getGas(2000)}, + new FluidStack[] { Materials.Ethane.getGas(1000), Materials.Methane.getGas(2000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butane.getSeverelyHydroCracked(1000), - new FluidStack[] {Materials.Methane.getGas(1000)}, + new FluidStack[] { Materials.Methane.getGas(1000) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butane.getLightlySteamCracked(1000), - new FluidStack[] { - Materials.Propane.getGas(750), - Materials.Ethane.getGas(125), - Materials.Ethylene.getGas(125), - Materials.Methane.getGas(1063) - }, + new FluidStack[] { Materials.Propane.getGas(750), Materials.Ethane.getGas(125), + Materials.Ethylene.getGas(125), Materials.Methane.getGas(1063) }, Materials.Carbon.getDustTiny(2), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butane.getModeratelySteamCracked(1000), - new FluidStack[] { - Materials.Propane.getGas(125), - Materials.Ethane.getGas(750), - Materials.Ethylene.getGas(750), - Materials.Methane.getGas(438) - }, + new FluidStack[] { Materials.Propane.getGas(125), Materials.Ethane.getGas(750), + Materials.Ethylene.getGas(750), Materials.Methane.getGas(438) }, Materials.Carbon.getDustTiny(2), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Butane.getSeverelySteamCracked(1000), - new FluidStack[] { - Materials.Propane.getGas(125), - Materials.Ethane.getGas(125), - Materials.Ethylene.getGas(125), - Materials.Methane.getGas(2000) - }, + new FluidStack[] { Materials.Propane.getGas(125), Materials.Ethane.getGas(125), + Materials.Ethylene.getGas(125), Materials.Methane.getGas(2000) }, Materials.Carbon.getDustTiny(11), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Gas.getLightlyHydroCracked(1000), - new FluidStack[] { - Materials.Methane.getGas(1300), Materials.Hydrogen.getGas(1500), Materials.Helium.getGas(100) - }, + new FluidStack[] { Materials.Methane.getGas(1300), Materials.Hydrogen.getGas(1500), + Materials.Helium.getGas(100) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Gas.getModeratelyHydroCracked(1000), - new FluidStack[] { - Materials.Methane.getGas(1400), Materials.Hydrogen.getGas(3000), Materials.Helium.getGas(150) - }, + new FluidStack[] { Materials.Methane.getGas(1400), Materials.Hydrogen.getGas(3000), + Materials.Helium.getGas(150) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Gas.getSeverelyHydroCracked(1000), - new FluidStack[] { - Materials.Methane.getGas(1500), Materials.Hydrogen.getGas(4000), Materials.Helium.getGas(200) - }, + new FluidStack[] { Materials.Methane.getGas(1500), Materials.Hydrogen.getGas(4000), + Materials.Helium.getGas(200) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Gas.getLightlySteamCracked(1000), - new FluidStack[] { - Materials.Propene.getGas(50), - Materials.Ethane.getGas(10), - Materials.Ethylene.getGas(100), - Materials.Methane.getGas(500), - Materials.Helium.getGas(50) - }, + new FluidStack[] { Materials.Propene.getGas(50), Materials.Ethane.getGas(10), + Materials.Ethylene.getGas(100), Materials.Methane.getGas(500), Materials.Helium.getGas(50) }, Materials.Carbon.getDustTiny(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Gas.getModeratelySteamCracked(1000), - new FluidStack[] { - Materials.Propene.getGas(10), - Materials.Ethane.getGas(50), - Materials.Ethylene.getGas(200), - Materials.Methane.getGas(600), - Materials.Helium.getGas(70) - }, + new FluidStack[] { Materials.Propene.getGas(10), Materials.Ethane.getGas(50), + Materials.Ethylene.getGas(200), Materials.Methane.getGas(600), Materials.Helium.getGas(70) }, Materials.Carbon.getDustTiny(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Gas.getSeverelySteamCracked(1000), - new FluidStack[] { - Materials.Propene.getGas(10), - Materials.Ethane.getGas(10), - Materials.Ethylene.getGas(300), - Materials.Methane.getGas(700), - Materials.Helium.getGas(100) - }, + new FluidStack[] { Materials.Propene.getGas(10), Materials.Ethane.getGas(10), + Materials.Ethylene.getGas(300), Materials.Methane.getGas(700), Materials.Helium.getGas(100) }, Materials.Carbon.getDustTiny(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Naphtha.getLightlyHydroCracked(1000), - new FluidStack[] { - Materials.Butane.getGas(800), - Materials.Propane.getGas(300), - Materials.Ethane.getGas(250), - Materials.Methane.getGas(250) - }, + new FluidStack[] { Materials.Butane.getGas(800), Materials.Propane.getGas(300), + Materials.Ethane.getGas(250), Materials.Methane.getGas(250) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Naphtha.getModeratelyHydroCracked(1000), - new FluidStack[] { - Materials.Butane.getGas(200), - Materials.Propane.getGas(1100), - Materials.Ethane.getGas(400), - Materials.Methane.getGas(400) - }, + new FluidStack[] { Materials.Butane.getGas(200), Materials.Propane.getGas(1100), + Materials.Ethane.getGas(400), Materials.Methane.getGas(400) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Naphtha.getSeverelyHydroCracked(1000), - new FluidStack[] { - Materials.Butane.getGas(125), - Materials.Propane.getGas(125), - Materials.Ethane.getGas(1500), - Materials.Methane.getGas(1500) - }, + new FluidStack[] { Materials.Butane.getGas(125), Materials.Propane.getGas(125), + Materials.Ethane.getGas(1500), Materials.Methane.getGas(1500) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Naphtha.getLightlySteamCracked(1000), - new FluidStack[] { - Materials.HeavyFuel.getFluid(75), - Materials.LightFuel.getFluid(150), - Materials.Toluene.getFluid(40), - Materials.Benzene.getFluid(150), - Materials.Butene.getGas(80), - Materials.Butadiene.getGas(150), - Materials.Propane.getGas(15), - Materials.Propene.getGas(200), - Materials.Ethane.getGas(35), - Materials.Ethylene.getGas(200), - Materials.Methane.getGas(200) - }, + new FluidStack[] { Materials.HeavyFuel.getFluid(75), Materials.LightFuel.getFluid(150), + Materials.Toluene.getFluid(40), Materials.Benzene.getFluid(150), Materials.Butene.getGas(80), + Materials.Butadiene.getGas(150), Materials.Propane.getGas(15), Materials.Propene.getGas(200), + Materials.Ethane.getGas(35), Materials.Ethylene.getGas(200), Materials.Methane.getGas(200) }, Materials.Carbon.getDustTiny(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Naphtha.getModeratelySteamCracked(1000), - new FluidStack[] { - Materials.HeavyFuel.getFluid(50), - Materials.LightFuel.getFluid(100), - Materials.Toluene.getFluid(30), - Materials.Benzene.getFluid(125), - Materials.Butene.getGas(65), - Materials.Butadiene.getGas(100), - Materials.Propane.getGas(30), - Materials.Propene.getGas(400), - Materials.Ethane.getGas(50), - Materials.Ethylene.getGas(350), - Materials.Methane.getGas(350) - }, + new FluidStack[] { Materials.HeavyFuel.getFluid(50), Materials.LightFuel.getFluid(100), + Materials.Toluene.getFluid(30), Materials.Benzene.getFluid(125), Materials.Butene.getGas(65), + Materials.Butadiene.getGas(100), Materials.Propane.getGas(30), Materials.Propene.getGas(400), + Materials.Ethane.getGas(50), Materials.Ethylene.getGas(350), Materials.Methane.getGas(350) }, Materials.Carbon.getDustTiny(2), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.Naphtha.getSeverelySteamCracked(1000), - new FluidStack[] { - Materials.HeavyFuel.getFluid(25), - Materials.LightFuel.getFluid(50), - Materials.Toluene.getFluid(20), - Materials.Benzene.getFluid(100), - Materials.Butene.getGas(50), - Materials.Butadiene.getGas(50), - Materials.Propane.getGas(15), - Materials.Propene.getGas(300), - Materials.Ethane.getGas(65), - Materials.Ethylene.getGas(500), - Materials.Methane.getGas(500) - }, + new FluidStack[] { Materials.HeavyFuel.getFluid(25), Materials.LightFuel.getFluid(50), + Materials.Toluene.getFluid(20), Materials.Benzene.getFluid(100), Materials.Butene.getGas(50), + Materials.Butadiene.getGas(50), Materials.Propane.getGas(15), Materials.Propene.getGas(300), + Materials.Ethane.getGas(65), Materials.Ethylene.getGas(500), Materials.Methane.getGas(500) }, Materials.Carbon.getDustTiny(3), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.LightFuel.getLightlyHydroCracked(1000), - new FluidStack[] { - Materials.Naphtha.getFluid(800), - Materials.Octane.getFluid(100), - Materials.Butane.getGas(150), - Materials.Propane.getGas(200), - Materials.Ethane.getGas(125), - Materials.Methane.getGas(125) - }, + new FluidStack[] { Materials.Naphtha.getFluid(800), Materials.Octane.getFluid(100), + Materials.Butane.getGas(150), Materials.Propane.getGas(200), Materials.Ethane.getGas(125), + Materials.Methane.getGas(125) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.LightFuel.getModeratelyHydroCracked(1000), - new FluidStack[] { - Materials.Naphtha.getFluid(500), - Materials.Octane.getFluid(50), - Materials.Butane.getGas(200), - Materials.Propane.getGas(1100), - Materials.Ethane.getGas(400), - Materials.Methane.getGas(400) - }, + new FluidStack[] { Materials.Naphtha.getFluid(500), Materials.Octane.getFluid(50), + Materials.Butane.getGas(200), Materials.Propane.getGas(1100), Materials.Ethane.getGas(400), + Materials.Methane.getGas(400) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.LightFuel.getSeverelyHydroCracked(1000), - new FluidStack[] { - Materials.Naphtha.getFluid(200), - Materials.Octane.getFluid(20), - Materials.Butane.getGas(125), - Materials.Propane.getGas(125), - Materials.Ethane.getGas(1500), - Materials.Methane.getGas(1500) - }, + new FluidStack[] { Materials.Naphtha.getFluid(200), Materials.Octane.getFluid(20), + Materials.Butane.getGas(125), Materials.Propane.getGas(125), Materials.Ethane.getGas(1500), + Materials.Methane.getGas(1500) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.LightFuel.getLightlySteamCracked(1000), - new FluidStack[] { - Materials.HeavyFuel.getFluid(150), - Materials.Naphtha.getFluid(400), - Materials.Toluene.getFluid(40), - Materials.Benzene.getFluid(200), - Materials.Butene.getGas(75), - Materials.Butadiene.getGas(60), - Materials.Propane.getGas(20), - Materials.Propene.getGas(150), - Materials.Ethane.getGas(10), - Materials.Ethylene.getGas(50), - Materials.Methane.getGas(50) - }, + new FluidStack[] { Materials.HeavyFuel.getFluid(150), Materials.Naphtha.getFluid(400), + Materials.Toluene.getFluid(40), Materials.Benzene.getFluid(200), Materials.Butene.getGas(75), + Materials.Butadiene.getGas(60), Materials.Propane.getGas(20), Materials.Propene.getGas(150), + Materials.Ethane.getGas(10), Materials.Ethylene.getGas(50), Materials.Methane.getGas(50) }, Materials.Carbon.getDustTiny(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.LightFuel.getModeratelySteamCracked(1000), - new FluidStack[] { - Materials.HeavyFuel.getFluid(100), - Materials.Naphtha.getFluid(250), - Materials.Toluene.getFluid(50), - Materials.Benzene.getFluid(300), - Materials.Butene.getGas(90), - Materials.Butadiene.getGas(75), - Materials.Propane.getGas(35), - Materials.Propene.getGas(200), - Materials.Ethane.getGas(30), - Materials.Ethylene.getGas(150), - Materials.Methane.getGas(150) - }, + new FluidStack[] { Materials.HeavyFuel.getFluid(100), Materials.Naphtha.getFluid(250), + Materials.Toluene.getFluid(50), Materials.Benzene.getFluid(300), Materials.Butene.getGas(90), + Materials.Butadiene.getGas(75), Materials.Propane.getGas(35), Materials.Propene.getGas(200), + Materials.Ethane.getGas(30), Materials.Ethylene.getGas(150), Materials.Methane.getGas(150) }, Materials.Carbon.getDustTiny(2), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.LightFuel.getSeverelySteamCracked(1000), - new FluidStack[] { - Materials.HeavyFuel.getFluid(50), - Materials.Naphtha.getFluid(100), - Materials.Toluene.getFluid(30), - Materials.Benzene.getFluid(150), - Materials.Butene.getGas(65), - Materials.Butadiene.getGas(50), - Materials.Propane.getGas(50), - Materials.Propene.getGas(250), - Materials.Ethane.getGas(50), - Materials.Ethylene.getGas(250), - Materials.Methane.getGas(250) - }, + new FluidStack[] { Materials.HeavyFuel.getFluid(50), Materials.Naphtha.getFluid(100), + Materials.Toluene.getFluid(30), Materials.Benzene.getFluid(150), Materials.Butene.getGas(65), + Materials.Butadiene.getGas(50), Materials.Propane.getGas(50), Materials.Propene.getGas(250), + Materials.Ethane.getGas(50), Materials.Ethylene.getGas(250), Materials.Methane.getGas(250) }, Materials.Carbon.getDustTiny(3), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.HeavyFuel.getLightlyHydroCracked(1000), - new FluidStack[] { - Materials.LightFuel.getFluid(600), - Materials.Naphtha.getFluid(100), - Materials.Butane.getGas(100), - Materials.Propane.getGas(100), - Materials.Ethane.getGas(75), - Materials.Methane.getGas(75) - }, + new FluidStack[] { Materials.LightFuel.getFluid(600), Materials.Naphtha.getFluid(100), + Materials.Butane.getGas(100), Materials.Propane.getGas(100), Materials.Ethane.getGas(75), + Materials.Methane.getGas(75) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.HeavyFuel.getModeratelyHydroCracked(1000), - new FluidStack[] { - Materials.LightFuel.getFluid(400), - Materials.Naphtha.getFluid(400), - Materials.Butane.getGas(150), - Materials.Propane.getGas(150), - Materials.Ethane.getGas(100), - Materials.Methane.getGas(100) - }, + new FluidStack[] { Materials.LightFuel.getFluid(400), Materials.Naphtha.getFluid(400), + Materials.Butane.getGas(150), Materials.Propane.getGas(150), Materials.Ethane.getGas(100), + Materials.Methane.getGas(100) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.HeavyFuel.getSeverelyHydroCracked(1000), - new FluidStack[] { - Materials.LightFuel.getFluid(200), - Materials.Naphtha.getFluid(250), - Materials.Butane.getGas(300), - Materials.Propane.getGas(300), - Materials.Ethane.getGas(175), - Materials.Methane.getGas(175) - }, + new FluidStack[] { Materials.LightFuel.getFluid(200), Materials.Naphtha.getFluid(250), + Materials.Butane.getGas(300), Materials.Propane.getGas(300), Materials.Ethane.getGas(175), + Materials.Methane.getGas(175) }, GT_Values.NI, 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.HeavyFuel.getLightlySteamCracked(1000), - new FluidStack[] { - Materials.LightFuel.getFluid(300), - Materials.Naphtha.getFluid(50), - Materials.Toluene.getFluid(25), - Materials.Benzene.getFluid(125), - Materials.Butene.getGas(25), - Materials.Butadiene.getGas(15), - Materials.Propane.getGas(3), - Materials.Propene.getGas(30), - Materials.Ethane.getGas(5), - Materials.Ethylene.getGas(50), - Materials.Methane.getGas(50) - }, + new FluidStack[] { Materials.LightFuel.getFluid(300), Materials.Naphtha.getFluid(50), + Materials.Toluene.getFluid(25), Materials.Benzene.getFluid(125), Materials.Butene.getGas(25), + Materials.Butadiene.getGas(15), Materials.Propane.getGas(3), Materials.Propene.getGas(30), + Materials.Ethane.getGas(5), Materials.Ethylene.getGas(50), Materials.Methane.getGas(50) }, Materials.Carbon.getDustTiny(1), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.HeavyFuel.getModeratelySteamCracked(1000), - new FluidStack[] { - Materials.LightFuel.getFluid(200), - Materials.Naphtha.getFluid(200), - Materials.Toluene.getFluid(40), - Materials.Benzene.getFluid(200), - Materials.Butene.getGas(40), - Materials.Butadiene.getGas(25), - Materials.Propane.getGas(5), - Materials.Propene.getGas(50), - Materials.Ethane.getGas(7), - Materials.Ethylene.getGas(75), - Materials.Methane.getGas(75) - }, + new FluidStack[] { Materials.LightFuel.getFluid(200), Materials.Naphtha.getFluid(200), + Materials.Toluene.getFluid(40), Materials.Benzene.getFluid(200), Materials.Butene.getGas(40), + Materials.Butadiene.getGas(25), Materials.Propane.getGas(5), Materials.Propene.getGas(50), + Materials.Ethane.getGas(7), Materials.Ethylene.getGas(75), Materials.Methane.getGas(75) }, Materials.Carbon.getDustTiny(2), 120, 120); GT_Values.RA.addUniversalDistillationRecipe( Materials.HeavyFuel.getSeverelySteamCracked(1000), - new FluidStack[] { - Materials.LightFuel.getFluid(100), - Materials.Naphtha.getFluid(125), - Materials.Toluene.getFluid(80), - Materials.Benzene.getFluid(400), - Materials.Butene.getGas(80), - Materials.Butadiene.getGas(50), - Materials.Propane.getGas(10), - Materials.Propene.getGas(100), - Materials.Ethane.getGas(15), - Materials.Ethylene.getGas(150), - Materials.Methane.getGas(150) - }, + new FluidStack[] { Materials.LightFuel.getFluid(100), Materials.Naphtha.getFluid(125), + Materials.Toluene.getFluid(80), Materials.Benzene.getFluid(400), Materials.Butene.getGas(80), + Materials.Butadiene.getGas(50), Materials.Propane.getGas(10), Materials.Propene.getGas(100), + Materials.Ethane.getGas(15), Materials.Ethylene.getGas(150), Materials.Methane.getGas(150) }, Materials.Carbon.getDustTiny(3), 120, 120); @@ -1310,24 +1084,18 @@ public class DistilleryRecipes implements Runnable { // 9C5H12O = 4C6H14O + 5CH4O + 4C4H8 GT_Values.RA.addDistillationTowerRecipe( Materials.MTBEMixture.getGas(900L), - new FluidStack[] { - Materials.AntiKnock.getFluid(400L), Materials.Methanol.getFluid(500L), Materials.Butene.getGas(400L) - }, + new FluidStack[] { Materials.AntiKnock.getFluid(400L), Materials.Methanol.getFluid(500L), + Materials.Butene.getGas(400L) }, null, 40, 240); GT_Values.RA.addDistillationTowerRecipe( Materials.FermentedBiomass.getFluid(1000), - new FluidStack[] { - Materials.AceticAcid.getFluid(25), - Materials.Water.getFluid(375), - Materials.Ethanol.getFluid(150), - Materials.Methanol.getFluid(150), - Materials.Ammonia.getGas(100), - Materials.CarbonDioxide.getGas(400), - Materials.Methane.getGas(600) - }, + new FluidStack[] { Materials.AceticAcid.getFluid(25), Materials.Water.getFluid(375), + Materials.Ethanol.getFluid(150), Materials.Methanol.getFluid(150), + Materials.Ammonia.getGas(100), Materials.CarbonDioxide.getGas(400), + Materials.Methane.getGas(600) }, ItemList.IC2_Fertilizer.get(1), 75, 180); @@ -1336,12 +1104,9 @@ public class DistilleryRecipes implements Runnable { && FluidRegistry.getFluid("oilgc") != null) GT_Values.RA.addUniversalDistillationRecipe( new FluidStack(FluidRegistry.getFluid("oilgc"), 50), - new FluidStack[] { - Materials.SulfuricHeavyFuel.getFluid(15), - Materials.SulfuricLightFuel.getFluid(50), - Materials.SulfuricNaphtha.getFluid(20), - Materials.SulfuricGas.getGas(60) - }, + new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(15), + Materials.SulfuricLightFuel.getFluid(50), Materials.SulfuricNaphtha.getFluid(20), + Materials.SulfuricGas.getGas(60) }, null, 20, 96); @@ -1349,9 +1114,8 @@ public class DistilleryRecipes implements Runnable { if (!GregTech_API.mIC2Classic) { GT_Values.RA.addDistillationTowerRecipe( new FluidStack(FluidRegistry.getFluid("ic2biomass"), 3000), - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000), Materials.Water.getFluid(125L) - }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000), + Materials.Water.getFluid(125L) }, ItemList.IC2_Fertilizer.get(1), 250, 480); diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java index 5f47077370..f81db12c0e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java @@ -1,5 +1,9 @@ package gregtech.loaders.postload.recipes; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -7,11 +11,9 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class ElectrolyzerRecipes implements Runnable { + @Override public void run() { // H2O = 2H + O @@ -168,7 +170,7 @@ public class ElectrolyzerRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {10000, 10000, 917, 0, 0, 0}, + new int[] { 10000, 10000, 917, 0, 0, 0 }, 200, 30); // IC2 Fertilizer = H2O + CaCO3 + C @@ -199,7 +201,7 @@ public class ElectrolyzerRecipes implements Runnable { GT_Values.NI, GT_Values.NI, GT_Values.NI, - new int[] {10000, 10000}, + new int[] { 10000, 10000 }, 1000, 60); diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java index 8147f5497e..a080e8fa35 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java @@ -5,6 +5,7 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsOreAlum; public class ElectromagneticSeparatorRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addElectromagneticSeparatorRecipe( @@ -12,7 +13,7 @@ public class ElectromagneticSeparatorRecipes implements Runnable { Materials.Iron.getDust(1), Materials.Neodymium.getDust(1), Materials.Chrome.getDust(1), - new int[] {4000, 2000, 2000}, + new int[] { 4000, 2000, 2000 }, 200, 240); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java index 2b4874afd7..a63029db3e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java @@ -3,17 +3,19 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isEBXLLoaded; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ExtractorRecipes implements Runnable { + @Override public void run() { GT_ModHandler.addExtractionRecipe(new ItemStack(Blocks.bookshelf, 1, 32767), new ItemStack(Items.book, 3, 0)); @@ -21,7 +23,8 @@ public class ExtractorRecipes implements Runnable { new ItemStack(Items.slime_ball, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 2L)); GT_ModHandler.addExtractionRecipe( - ItemList.IC2_Resin.get(1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L)); + ItemList.IC2_Resin.get(1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L)); GT_ModHandler.addExtractionRecipe( GT_ModHandler.getIC2Item("rubberSapling", 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L)); @@ -31,61 +34,89 @@ public class ExtractorRecipes implements Runnable { GT_ModHandler.addExtractionRecipe(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L)); if (isEBXLLoaded) { GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "waterplant1", 1, 0), new ItemStack(Items.dye, 4, 2)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "waterplant1", 1, 0), + new ItemStack(Items.dye, 4, 2)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "vines", 1, 0), new ItemStack(Items.dye, 4, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "vines", 1, 0), + new ItemStack(Items.dye, 4, 1)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 11), new ItemStack(Items.dye, 4, 11)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 11), + new ItemStack(Items.dye, 4, 11)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 10), new ItemStack(Items.dye, 4, 5)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 10), + new ItemStack(Items.dye, 4, 5)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 9), new ItemStack(Items.dye, 4, 14)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 9), + new ItemStack(Items.dye, 4, 14)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 8), new ItemStack(Items.dye, 4, 14)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 8), + new ItemStack(Items.dye, 4, 14)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 7), new ItemStack(Items.dye, 4, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 7), + new ItemStack(Items.dye, 4, 1)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 6), new ItemStack(Items.dye, 4, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 6), + new ItemStack(Items.dye, 4, 1)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 5), new ItemStack(Items.dye, 4, 11)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 5), + new ItemStack(Items.dye, 4, 11)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 0), new ItemStack(Items.dye, 4, 9)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 0), + new ItemStack(Items.dye, 4, 9)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 4), new ItemStack(Items.dye, 4, 11)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 4), + new ItemStack(Items.dye, 4, 11)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 3), new ItemStack(Items.dye, 4, 13)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 3), + new ItemStack(Items.dye, 4, 13)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 3), new ItemStack(Items.dye, 4, 5)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 3), + new ItemStack(Items.dye, 4, 5)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 2), new ItemStack(Items.dye, 4, 5)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 2), + new ItemStack(Items.dye, 4, 5)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 1), new ItemStack(Items.dye, 4, 12)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 1), + new ItemStack(Items.dye, 4, 12)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 15), new ItemStack(Items.dye, 4, 11)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 15), + new ItemStack(Items.dye, 4, 11)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 14), new ItemStack(Items.dye, 4, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 14), + new ItemStack(Items.dye, 4, 1)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 13), new ItemStack(Items.dye, 4, 9)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 13), + new ItemStack(Items.dye, 4, 9)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 12), new ItemStack(Items.dye, 4, 14)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 12), + new ItemStack(Items.dye, 4, 14)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 11), new ItemStack(Items.dye, 4, 7)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 11), + new ItemStack(Items.dye, 4, 7)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 7), new ItemStack(Items.dye, 4, 7)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 7), + new ItemStack(Items.dye, 4, 7)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 2), new ItemStack(Items.dye, 4, 11)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 2), + new ItemStack(Items.dye, 4, 11)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 13), new ItemStack(Items.dye, 4, 6)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 13), + new ItemStack(Items.dye, 4, 6)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 6), new ItemStack(Items.dye, 4, 12)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 6), + new ItemStack(Items.dye, 4, 12)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 5), new ItemStack(Items.dye, 4, 10)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 5), + new ItemStack(Items.dye, 4, 10)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 2), new ItemStack(Items.dye, 4, 1)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 2), + new ItemStack(Items.dye, 4, 1)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 1), new ItemStack(Items.dye, 4, 9)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 1), + new ItemStack(Items.dye, 4, 9)); GT_ModHandler.addExtractionRecipe( - getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 0), new ItemStack(Items.dye, 4, 13)); + getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 0), + new ItemStack(Items.dye, 4, 13)); GT_ModHandler.addExtractionRecipe( getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 7), diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java index 34d946f003..34bf1a5968 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java @@ -4,10 +4,15 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; public class ExtruderRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addExtruderRecipe( - ItemList.FR_Wax.get(1L), ItemList.Shape_Extruder_Cell.get(0L), ItemList.FR_WaxCapsule.get(1L), 64, 16); + ItemList.FR_Wax.get(1L), + ItemList.Shape_Extruder_Cell.get(0L), + ItemList.FR_WaxCapsule.get(1L), + 64, + 16); GT_Values.RA.addExtruderRecipe( ItemList.FR_RefractoryWax.get(1L), diff --git a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java index fa37a69eb5..469be24dec 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java @@ -2,16 +2,21 @@ package gregtech.loaders.postload.recipes; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; + public class FermenterRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addFermentingRecipe( - Materials.Biomass.getFluid(100), Materials.FermentedBiomass.getFluid(100), 150, false); + Materials.Biomass.getFluid(100), + Materials.FermentedBiomass.getFluid(100), + 150, + false); GT_Values.RA.addFermentingRecipe( new FluidStack(FluidRegistry.getFluid("ic2biomass"), 100), Materials.FermentedBiomass.getFluid(100), @@ -20,94 +25,205 @@ public class FermenterRecipes implements Runnable { GT_Values.RA.addFermentingRecipe(getFluidStack("milk", 50), getFluidStack("potion.mundane", 25), 1024, false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.lemonjuice", 50), getFluidStack("potion.limoncello", 25), 1024, true); - GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.applejuice", 50), getFluidStack("potion.cider", 25), 1024, false); + getFluidStack("potion.lemonjuice", 50), + getFluidStack("potion.limoncello", 25), + 1024, + true); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.goldenapplejuice", 50), getFluidStack("potion.goldencider", 25), 1024, true); + getFluidStack("potion.applejuice", 50), + getFluidStack("potion.cider", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.idunsapplejuice", 50), getFluidStack("potion.notchesbrew", 25), 1024, true); + getFluidStack("potion.goldenapplejuice", 50), + getFluidStack("potion.goldencider", 25), + 1024, + true); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.reedwater", 50), getFluidStack("potion.rum", 25), 1024, true); + getFluidStack("potion.idunsapplejuice", 50), + getFluidStack("potion.notchesbrew", 25), + 1024, + true); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.rum", 50), getFluidStack("potion.piratebrew", 10), 2048, false); + getFluidStack("potion.reedwater", 50), + getFluidStack("potion.rum", 25), + 1024, + true); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.grapejuice", 50), getFluidStack("potion.wine", 25), 1024, false); + getFluidStack("potion.rum", 50), + getFluidStack("potion.piratebrew", 10), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.wine", 50), getFluidStack("potion.vinegar", 10), 2048, true); + getFluidStack("potion.grapejuice", 50), + getFluidStack("potion.wine", 25), + 1024, + false); + GT_Values.RA + .addFermentingRecipe(getFluidStack("potion.wine", 50), getFluidStack("potion.vinegar", 10), 2048, true); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.wheatyjuice", 50), getFluidStack("potion.scotch", 25), 1024, true); + getFluidStack("potion.wheatyjuice", 50), + getFluidStack("potion.scotch", 25), + 1024, + true); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.scotch", 50), getFluidStack("potion.glenmckenner", 10), 2048, true); + getFluidStack("potion.scotch", 50), + getFluidStack("potion.glenmckenner", 10), + 2048, + true); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.wheatyhopsjuice", 50), getFluidStack("potion.beer", 25), 1024, false); + getFluidStack("potion.wheatyhopsjuice", 50), + getFluidStack("potion.beer", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.hopsjuice", 50), getFluidStack("potion.darkbeer", 25), 1024, false); + getFluidStack("potion.hopsjuice", 50), + getFluidStack("potion.darkbeer", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.darkbeer", 50), getFluidStack("potion.dragonblood", 10), 2048, true); + getFluidStack("potion.darkbeer", 50), + getFluidStack("potion.dragonblood", 10), + 2048, + true); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.beer", 75), getFluidStack("potion.vinegar", 50), 2048, false); - GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.cider", 75), getFluidStack("potion.vinegar", 50), 2048, false); + getFluidStack("potion.beer", 75), + getFluidStack("potion.vinegar", 50), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.goldencider", 75), getFluidStack("potion.vinegar", 50), 2048, true); + getFluidStack("potion.cider", 75), + getFluidStack("potion.vinegar", 50), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.rum", 75), getFluidStack("potion.vinegar", 50), 2048, false); + getFluidStack("potion.goldencider", 75), + getFluidStack("potion.vinegar", 50), + 2048, + true); + GT_Values.RA + .addFermentingRecipe(getFluidStack("potion.rum", 75), getFluidStack("potion.vinegar", 50), 2048, false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.wine", 75), getFluidStack("potion.vinegar", 50), 2048, false); + getFluidStack("potion.wine", 75), + getFluidStack("potion.vinegar", 50), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.awkward", 50), getFluidStack("potion.weakness", 25), 1024, false); + getFluidStack("potion.awkward", 50), + getFluidStack("potion.weakness", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.mundane", 50), getFluidStack("potion.weakness", 25), 1024, false); + getFluidStack("potion.mundane", 50), + getFluidStack("potion.weakness", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.thick", 50), getFluidStack("potion.weakness", 25), 1024, false); + getFluidStack("potion.thick", 50), + getFluidStack("potion.weakness", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.poison", 50), getFluidStack("potion.damage", 25), 1024, false); + getFluidStack("potion.poison", 50), + getFluidStack("potion.damage", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.health", 50), getFluidStack("potion.damage", 25), 1024, false); + getFluidStack("potion.health", 50), + getFluidStack("potion.damage", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.waterbreathing", 50), getFluidStack("potion.damage", 25), 1024, false); + getFluidStack("potion.waterbreathing", 50), + getFluidStack("potion.damage", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.nightvision", 50), getFluidStack("potion.invisibility", 25), 1024, false); + getFluidStack("potion.nightvision", 50), + getFluidStack("potion.invisibility", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.fireresistance", 50), getFluidStack("potion.slowness", 25), 1024, false); + getFluidStack("potion.fireresistance", 50), + getFluidStack("potion.slowness", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.speed", 50), getFluidStack("potion.slowness", 25), 1024, false); + getFluidStack("potion.speed", 50), + getFluidStack("potion.slowness", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.strength", 50), getFluidStack("potion.weakness", 25), 1024, false); + getFluidStack("potion.strength", 50), + getFluidStack("potion.weakness", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.regen", 50), getFluidStack("potion.poison", 25), 1024, false); + getFluidStack("potion.regen", 50), + getFluidStack("potion.poison", 25), + 1024, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.poison.strong", 50), getFluidStack("potion.damage.strong", 10), 2048, false); + getFluidStack("potion.poison.strong", 50), + getFluidStack("potion.damage.strong", 10), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.health.strong", 50), getFluidStack("potion.damage.strong", 10), 2048, false); + getFluidStack("potion.health.strong", 50), + getFluidStack("potion.damage.strong", 10), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.speed.strong", 50), getFluidStack("potion.slowness.strong", 10), 2048, false); + getFluidStack("potion.speed.strong", 50), + getFluidStack("potion.slowness.strong", 10), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.strength.strong", 50), getFluidStack("potion.weakness.strong", 10), 2048, false); + getFluidStack("potion.strength.strong", 50), + getFluidStack("potion.weakness.strong", 10), + 2048, + false); GT_Values.RA.addFermentingRecipe( getFluidStack("potion.nightvision.long", 50), getFluidStack("potion.invisibility.long", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.regen.strong", 50), getFluidStack("potion.poison.strong", 10), 2048, false); + getFluidStack("potion.regen.strong", 50), + getFluidStack("potion.poison.strong", 10), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.poison.long", 50), getFluidStack("potion.damage.long", 10), 2048, false); + getFluidStack("potion.poison.long", 50), + getFluidStack("potion.damage.long", 10), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.waterbreathing.long", 50), getFluidStack("potion.damage.long", 10), 2048, false); + getFluidStack("potion.waterbreathing.long", 50), + getFluidStack("potion.damage.long", 10), + 2048, + false); GT_Values.RA.addFermentingRecipe( getFluidStack("potion.fireresistance.long", 50), getFluidStack("potion.slowness.long", 10), 2048, false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.speed.long", 50), getFluidStack("potion.slowness.long", 10), 2048, false); + getFluidStack("potion.speed.long", 50), + getFluidStack("potion.slowness.long", 10), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.strength.long", 50), getFluidStack("potion.weakness.long", 10), 2048, false); + getFluidStack("potion.strength.long", 50), + getFluidStack("potion.weakness.long", 10), + 2048, + false); GT_Values.RA.addFermentingRecipe( - getFluidStack("potion.regen.long", 50), getFluidStack("potion.poison.long", 10), 2048, false); + getFluidStack("potion.regen.long", 50), + getFluidStack("potion.poison.long", 10), + 2048, + false); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java index 168b0a7f1a..caafd7f468 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java @@ -5,6 +5,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; public class FluidCannerRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addFluidCannerRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index 8b545be0ff..27cc9ff55c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -6,6 +6,11 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isBartWorksLoaded; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeHooks; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -16,20 +21,32 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_DummyWorld; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeHooks; public class FluidExtractorRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addFluidExtractionRecipe( - ItemList.Dye_SquidInk.get(1L), GT_Values.NI, 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, 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, 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), @@ -38,19 +55,54 @@ public class FluidExtractorRecipes implements Runnable { 128, 4); GT_Values.RA.addFluidExtractionRecipe( - ItemList.Crop_Drop_OilBerry.get(1L), GT_Values.NI, Materials.Oil.getFluid(100L), 10000, 128, 4); + ItemList.Crop_Drop_OilBerry.get(1L), + GT_Values.NI, + Materials.Oil.getFluid(100L), + 10000, + 128, + 4); GT_Values.RA.addFluidExtractionRecipe( - ItemList.Crop_Drop_UUMBerry.get(1L), GT_Values.NI, Materials.UUMatter.getFluid(4L), 10000, 128, 4); + ItemList.Crop_Drop_UUMBerry.get(1L), + GT_Values.NI, + Materials.UUMatter.getFluid(4L), + 10000, + 128, + 4); GT_Values.RA.addFluidExtractionRecipe( - ItemList.Crop_Drop_UUABerry.get(1L), GT_Values.NI, Materials.UUAmplifier.getFluid(4L), 10000, 128, 4); + ItemList.Crop_Drop_UUABerry.get(1L), + GT_Values.NI, + Materials.UUAmplifier.getFluid(4L), + 10000, + 128, + 4); GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(Items.fish, 1, 0), GT_Values.NI, Materials.FishOil.getFluid(40L), 10000, 16, 4); + new ItemStack(Items.fish, 1, 0), + GT_Values.NI, + Materials.FishOil.getFluid(40L), + 10000, + 16, + 4); GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(Items.fish, 1, 1), GT_Values.NI, Materials.FishOil.getFluid(60L), 10000, 16, 4); + new ItemStack(Items.fish, 1, 1), + GT_Values.NI, + Materials.FishOil.getFluid(60L), + 10000, + 16, + 4); GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(Items.fish, 1, 2), GT_Values.NI, Materials.FishOil.getFluid(70L), 10000, 16, 4); + new ItemStack(Items.fish, 1, 2), + GT_Values.NI, + Materials.FishOil.getFluid(70L), + 10000, + 16, + 4); GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(Items.fish, 1, 3), GT_Values.NI, Materials.FishOil.getFluid(30L), 10000, 16, 4); + new ItemStack(Items.fish, 1, 3), + GT_Values.NI, + Materials.FishOil.getFluid(30L), + 10000, + 16, + 4); GT_Values.RA.addFluidExtractionRecipe( new ItemStack(Items.coal, 1, 1), @@ -386,9 +438,19 @@ public class FluidExtractorRecipes implements Runnable { 1440); GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(Items.wheat_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(10), 10000, 32, 2); + new ItemStack(Items.wheat_seeds, 1, 32767), + GT_Values.NI, + Materials.SeedOil.getFluid(10), + 10000, + 32, + 2); GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(Items.melon_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(10), 10000, 32, 2); + new ItemStack(Items.melon_seeds, 1, 32767), + GT_Values.NI, + Materials.SeedOil.getFluid(10), + 10000, + 32, + 2); GT_Values.RA.addFluidExtractionRecipe( new ItemStack(Items.pumpkin_seeds, 1, 32767), GT_Values.NI, @@ -397,12 +459,27 @@ public class FluidExtractorRecipes implements Runnable { 32, 2); GT_Values.RA.addFluidExtractionRecipe( - ItemList.Crop_Drop_Rape.get(1), null, Materials.SeedOil.getFluid(125), 10000, 32, 2); + ItemList.Crop_Drop_Rape.get(1), + null, + Materials.SeedOil.getFluid(125), + 10000, + 32, + 2); GT_Values.RA.addFluidSmelterRecipe( - new ItemStack(Items.snowball, 1, 0), GT_Values.NI, Materials.Water.getFluid(250L), 10000, 32, 4); + new ItemStack(Items.snowball, 1, 0), + GT_Values.NI, + Materials.Water.getFluid(250L), + 10000, + 32, + 4); GT_Values.RA.addFluidSmelterRecipe( - new ItemStack(Blocks.snow, 1, 0), GT_Values.NI, Materials.Water.getFluid(1000L), 10000, 128, 4); + new ItemStack(Blocks.snow, 1, 0), + GT_Values.NI, + Materials.Water.getFluid(1000L), + 10000, + 128, + 4); GT_Values.RA.addFluidSmelterRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L), GT_Values.NI, @@ -439,10 +516,20 @@ public class FluidExtractorRecipes implements Runnable { if (isBartWorksLoaded) { // xenon GT_Values.RA.addFluidExtractionRecipe( - getModItem("gregtech", "gt.comb", 1L, 134), null, getFluidStack("xenon", 250), 100 * 100, 50, 8192); + getModItem("gregtech", "gt.comb", 1L, 134), + null, + getFluidStack("xenon", 250), + 100 * 100, + 50, + 8192); // neon GT_Values.RA.addFluidExtractionRecipe( - getModItem("gregtech", "gt.comb", 1L, 135), null, getFluidStack("neon", 250), 100 * 100, 15, 8192); + getModItem("gregtech", "gt.comb", 1L, 135), + null, + getFluidStack("neon", 250), + 100 * 100, + 15, + 8192); // krpton GT_Values.RA.addFluidExtractionRecipe( getModItem("gregtech", "gt.comb", 1L, 136), diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java index 83a015be44..6b5259d10a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java @@ -6,6 +6,7 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; public class FluidHeaterRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addFluidHeaterRecipe( @@ -22,7 +23,11 @@ public class FluidHeaterRecipes implements Runnable { 30720); GT_Values.RA.addFluidHeaterRecipe( - GT_Utility.getIntegratedCircuit(1), Materials.Water.getFluid(6L), Materials.Water.getGas(960L), 30, 30); + GT_Utility.getIntegratedCircuit(1), + Materials.Water.getFluid(6L), + Materials.Water.getGas(960L), + 30, + 30); GT_Values.RA.addFluidHeaterRecipe( GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getDistilledWater(6L), diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java index 8e598c74d5..352b860724 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java @@ -5,47 +5,39 @@ import static gregtech.api.enums.GT_Values.MOD_ID_RC; import static gregtech.api.util.GT_ModHandler.getModItem; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class FluidSolidifierRecipes implements Runnable { + @Override public void run() { - Materials[] materialArray = new Materials[] { - Materials.Iron, - Materials.WroughtIron, - Materials.Gold, - Materials.Bronze, - Materials.Copper, - Materials.AnnealedCopper, - Materials.Tin, - Materials.Lead, - Materials.Steel - }; + Materials[] materialArray = new Materials[] { Materials.Iron, Materials.WroughtIron, Materials.Gold, + Materials.Bronze, Materials.Copper, Materials.AnnealedCopper, Materials.Tin, Materials.Lead, + Materials.Steel }; - ItemStack[] materialCasing = new ItemStack[] { - ItemList.IC2_Item_Casing_Iron.get(1L), - ItemList.IC2_Item_Casing_Iron.get(1L), - ItemList.IC2_Item_Casing_Gold.get(1L), - ItemList.IC2_Item_Casing_Bronze.get(1L), - ItemList.IC2_Item_Casing_Copper.get(1L), - ItemList.IC2_Item_Casing_Copper.get(1L), - ItemList.IC2_Item_Casing_Tin.get(1L), - ItemList.IC2_Item_Casing_Lead.get(1L), - ItemList.IC2_Item_Casing_Steel.get(1L) - }; + ItemStack[] materialCasing = new ItemStack[] { ItemList.IC2_Item_Casing_Iron.get(1L), + ItemList.IC2_Item_Casing_Iron.get(1L), ItemList.IC2_Item_Casing_Gold.get(1L), + ItemList.IC2_Item_Casing_Bronze.get(1L), ItemList.IC2_Item_Casing_Copper.get(1L), + ItemList.IC2_Item_Casing_Copper.get(1L), ItemList.IC2_Item_Casing_Tin.get(1L), + ItemList.IC2_Item_Casing_Lead.get(1L), ItemList.IC2_Item_Casing_Steel.get(1L) }; for (int i = 0; i < materialArray.length; i++) { if (materialArray[i].mStandardMoltenFluid != null) { GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Casing.get(0L), materialArray[i].getMolten(72L), materialCasing[i], 16, 8); + ItemList.Shape_Mold_Casing.get(0L), + materialArray[i].getMolten(72L), + materialCasing[i], + 16, + 8); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index 7bcca9ea5a..29d4b30203 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -4,36 +4,59 @@ import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isHardcoreEnderExpansionLoaded; -import gregtech.api.enums.*; -import gregtech.api.util.GT_OreDictUnificator; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.enums.*; +import gregtech.api.util.GT_OreDictUnificator; + public class ForgeHammerRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addForgeHammerRecipe( - new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 2), 10, 16); + new ItemStack(Blocks.stonebrick, 1, 0), + new ItemStack(Blocks.stonebrick, 1, 2), + 10, + 16); GT_Values.RA.addForgeHammerRecipe( - new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.cobblestone, 1, 0), 10, 16); + new ItemStack(Blocks.stone, 1, 0), + new ItemStack(Blocks.cobblestone, 1, 0), + 10, + 16); GT_Values.RA.addForgeHammerRecipe( - new ItemStack(Blocks.cobblestone, 1, 0), new ItemStack(Blocks.gravel, 1, 0), 10, 16); + new ItemStack(Blocks.cobblestone, 1, 0), + new ItemStack(Blocks.gravel, 1, 0), + 10, + 16); GT_Values.RA.addForgeHammerRecipe(new ItemStack(Blocks.gravel, 1, 0), new ItemStack(Blocks.sand, 1, 0), 10, 16); GT_Values.RA.addForgeHammerRecipe( - new ItemStack(Blocks.sandstone, 1, 32767), new ItemStack(Blocks.sand, 1, 0), 10, 16); + new ItemStack(Blocks.sandstone, 1, 32767), + new ItemStack(Blocks.sand, 1, 0), + 10, + 16); GT_Values.RA.addForgeHammerRecipe( - new ItemStack(Blocks.ice, 1, 0), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L), 10, 16); + new ItemStack(Blocks.ice, 1, 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L), + 10, + 16); GT_Values.RA.addForgeHammerRecipe( new ItemStack(Blocks.packed_ice, 1, 0), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 2L), 10, 16); GT_Values.RA.addForgeHammerRecipe( - new ItemStack(Blocks.brick_block, 1, 0), new ItemStack(Items.brick, 3, 0), 10, 16); + new ItemStack(Blocks.brick_block, 1, 0), + new ItemStack(Items.brick, 3, 0), + 10, + 16); GT_Values.RA.addForgeHammerRecipe( - new ItemStack(Blocks.nether_brick, 1, 0), new ItemStack(Items.netherbrick, 3, 0), 10, 16); + new ItemStack(Blocks.nether_brick, 1, 0), + new ItemStack(Items.netherbrick, 3, 0), + 10, + 16); GT_Values.RA.addForgeHammerRecipe( new ItemStack(Blocks.stained_glass, 1, 32767), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1L), @@ -59,10 +82,10 @@ public class ForgeHammerRecipes implements Runnable { GT_Values.RA.addForgeHammerRecipe(ItemList.Casing_Firebricks.get(1), ItemList.Firebrick.get(3), 10, 16); GT_Values.RA.addForgeHammerRecipe( - new ItemStack[] {ItemList.Tesseract.get(1L), getModItem(MOD_ID_GTPP, "MU-metaitem.01", 1, 32105)}, - new FluidStack[] {Materials.SpaceTime.getMolten(2880L)}, + new ItemStack[] { ItemList.Tesseract.get(1L), getModItem(MOD_ID_GTPP, "MU-metaitem.01", 1, 32105) }, + new FluidStack[] { Materials.SpaceTime.getMolten(2880L) }, null, - new FluidStack[] {Materials.Space.getMolten(1440L), Materials.Time.getMolten(1440L)}, + new FluidStack[] { Materials.Space.getMolten(1440L), Materials.Time.getMolten(1440L) }, 10 * 20, (int) TierEU.RECIPE_UXV); diff --git a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java index 4d6361a656..ea0ebae0fe 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java @@ -2,17 +2,19 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.util.GT_ModHandler.getModItem; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class FormingPressRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addFormingPressRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java index 7cacfb1482..b0b3bf8840 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java @@ -2,13 +2,15 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.util.GT_ModHandler.getModItem; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_ModHandler; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class FuelRecipes implements Runnable { + @Override public void run() { if (!GregTech_API.mIC2Classic) { diff --git a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java index 41d4c5dc1d..5416e56119 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java @@ -4,11 +4,12 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; public class FusionReactorRecipes implements Runnable { + @Override public void run() { // Fusion tiering -T1 32768EU/t -T2 65536EU/t - T3 131073EU/t - // Fusion with margin 32700 65450 131000 - // Startup max 160M EU 320M EU 640M EU + // Fusion with margin 32700 65450 131000 + // Startup max 160M EU 320M EU 640M EU // Fluid input,Fluid input,Fluid output,ticks,EU/t,Startup // FT1, FT2, FT3 - fusion tier required, + - requires different startup recipe (startup cost bigger than // available on the tier) diff --git a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java index 1e019d7d7d..30a9fe5b6c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java @@ -10,6 +10,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; public class ImplosionCompressorRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addImplosionRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java index 7c4a970332..93267a1a7e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java @@ -1,45 +1,47 @@ package gregtech.loaders.postload.recipes; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; + public class LaserEngraverRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addLaserEngraverRecipe( - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L)}, - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.ExcitedDTCC.getFluid(1000L)}, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L) }, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.ExcitedDTCC.getFluid(1000L) }, 50_000, 125_000, true); GT_Values.RA.addLaserEngraverRecipe( - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L)}, - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.ExcitedDTPC.getFluid(1000L)}, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L) }, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.ExcitedDTPC.getFluid(1000L) }, 50_000, 125_000 * 4, true); GT_Values.RA.addLaserEngraverRecipe( - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L)}, - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.ExcitedDTRC.getFluid(1000L)}, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L) }, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.ExcitedDTRC.getFluid(1000L) }, 50_000, 125_000 * 16, true); GT_Values.RA.addLaserEngraverRecipe( - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000L)}, - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.ExcitedDTEC.getFluid(1000L)}, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000L) }, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.ExcitedDTEC.getFluid(1000L) }, 50_000, 125_000 * 64, true); diff --git a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java index 5314767a1c..ed71f464ee 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java @@ -2,16 +2,18 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.util.GT_ModHandler.getModItem; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class LatheRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addLatheRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java index 30a18d7620..dcf2549a44 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java @@ -4,6 +4,7 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; public class MatterAmplifierRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addAmplifier(ItemList.IC2_Scrap.get(9L), 180, 1); diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index e32aad6e73..9531c1dfbc 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -6,18 +6,20 @@ import static gregtech.loaders.postload.GT_MachineRecipeLoader.isRailcraftLoaded import static gregtech.loaders.postload.GT_MachineRecipeLoader.isThaumcraftLoaded; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; -import gregtech.api.enums.*; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.loaders.postload.GT_MachineRecipeLoader; import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.enums.*; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import gregtech.loaders.postload.GT_MachineRecipeLoader; + public class MixerRecipes implements Runnable { @Override @@ -1122,70 +1124,51 @@ public class MixerRecipes implements Runnable { 100, 250); GT_Values.RA.addMixerRecipe( - new ItemStack[] { - Materials.NaquadahEnriched.getDust(8), - Materials.Holmium.getDust(2), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { Materials.NaquadahEnriched.getDust(8), Materials.Holmium.getDust(2), + GT_Utility.getIntegratedCircuit(4) }, null, - new ItemStack[] {Materials.EnrichedHolmium.getDust(10)}, + new ItemStack[] { Materials.EnrichedHolmium.getDust(10) }, null, 30 * 20, (int) GT_Values.VP[7]); // Catalysts for Plasma Forge. GT_Values.RA.addMixerRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(9)}, - new FluidStack[] { - Materials.Helium.getPlasma(1000L), - Materials.Iron.getPlasma(1000L), - Materials.Calcium.getPlasma(1000L), - Materials.Niobium.getPlasma(1000L) - }, - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.Helium.getPlasma(1000L), Materials.Iron.getPlasma(1000L), + Materials.Calcium.getPlasma(1000L), Materials.Niobium.getPlasma(1000L) }, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L) }, 50_000, 125_000); GT_Values.RA.addMixerRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(10)}, - new FluidStack[] { - Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L), - Materials.Radon.getPlasma(1000L), - Materials.Nickel.getPlasma(1000L), - Materials.Boron.getPlasma(1000L), - Materials.Sulfur.getPlasma(1000L) - }, - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(10) }, + new FluidStack[] { Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L), + Materials.Radon.getPlasma(1000L), Materials.Nickel.getPlasma(1000L), + Materials.Boron.getPlasma(1000L), Materials.Sulfur.getPlasma(1000L) }, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L) }, 50_000, 125_000 * 4); GT_Values.RA.addMixerRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(11)}, - new FluidStack[] { - Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L), - Materials.Nitrogen.getPlasma(1000L), - Materials.Zinc.getPlasma(1000L), - Materials.Silver.getPlasma(1000L), - Materials.Titanium.getPlasma(1000L) - }, - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(11) }, + new FluidStack[] { Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L), + Materials.Nitrogen.getPlasma(1000L), Materials.Zinc.getPlasma(1000L), + Materials.Silver.getPlasma(1000L), Materials.Titanium.getPlasma(1000L) }, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L) }, 50_000, 125_000 * 16); GT_Values.RA.addMixerRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(12)}, - new FluidStack[] { - Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L), - Materials.Americium.getPlasma(1000L), - Materials.Bismuth.getPlasma(1000L), - Materials.Oxygen.getPlasma(1000L), - Materials.Tin.getPlasma(1000L) - }, - new ItemStack[] {GT_Values.NI}, - new FluidStack[] {Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000L)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(12) }, + new FluidStack[] { Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L), + Materials.Americium.getPlasma(1000L), Materials.Bismuth.getPlasma(1000L), + Materials.Oxygen.getPlasma(1000L), Materials.Tin.getPlasma(1000L) }, + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000L) }, 50_000, 125_000 * 64); @@ -1407,10 +1390,10 @@ public class MixerRecipes implements Runnable { 16); RA.addMixerRecipe( - new ItemStack[] {ItemList.IC2_Spray_WeedEx.get(1)}, - new FluidStack[] {MaterialsKevlar.NaphthenicAcid.getFluid(10)}, + new ItemStack[] { ItemList.IC2_Spray_WeedEx.get(1) }, + new FluidStack[] { MaterialsKevlar.NaphthenicAcid.getFluid(10) }, new ItemStack[] {}, - new FluidStack[] {Materials.WeedEX9000.getFluid(750)}, + new FluidStack[] { Materials.WeedEX9000.getFluid(750) }, 100, 100); diff --git a/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java b/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java index 1bde38976a..e5ee87bae9 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java +++ b/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java @@ -1,11 +1,13 @@ package gregtech.loaders.postload.recipes; +import net.minecraft.item.ItemStack; + import codechicken.nei.api.API; import gregtech.common.items.GT_MetaGenerated_Item_03; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.item.ItemStack; public class NEIHiding implements Runnable { + @Override public void run() { for (int g = 0; g < 16; g++) { diff --git a/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java b/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java index 2e7530804e..b5cfd7282b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java +++ b/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java @@ -8,6 +8,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; public class OreDictUnification implements Runnable { + @Override public void run() { if (isHardcoreEnderExpansionLoaded) { diff --git a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java index c4ad801745..e317b6986b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java @@ -7,10 +7,15 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; public class PackagerRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addBoxingRecipe( - ItemList.IC2_Scrap.get(9L), ItemList.Schematic_3by3.get(0L), ItemList.IC2_Scrapbox.get(1L), 16, 1); + ItemList.IC2_Scrap.get(9L), + ItemList.Schematic_3by3.get(0L), + ItemList.IC2_Scrapbox.get(1L), + 16, + 1); GT_Values.RA.addBoxingRecipe( ItemList.Food_Fries.get(1L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L), diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java index 7b2bb878f0..a6db8ca9c5 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java @@ -4,41 +4,35 @@ import static gregtech.api.enums.GT_Values.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; -import gregtech.api.enums.*; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.enums.*; + public class PlasmaForgeRecipes implements Runnable { + @Override public void run() { // Giga chad trophy. GT_Values.RA.addPlasmaForgeRecipe( - new ItemStack[] { - ItemList.Field_Generator_UEV.get(64), - ItemList.Field_Generator_UIV.get(64), - ItemList.Field_Generator_UMV.get(64) - }, - new FluidStack[] { - Materials.ExcitedDTEC.getFluid(100_000_000), Materials.SpaceTime.getMolten(64 * 2 * 9 * 144) - }, - new ItemStack[] {ItemList.GigaChad.get(1)}, - new FluidStack[] {GT_Values.NF}, + new ItemStack[] { ItemList.Field_Generator_UEV.get(64), ItemList.Field_Generator_UIV.get(64), + ItemList.Field_Generator_UMV.get(64) }, + new FluidStack[] { Materials.ExcitedDTEC.getFluid(100_000_000), + Materials.SpaceTime.getMolten(64 * 2 * 9 * 144) }, + new ItemStack[] { ItemList.GigaChad.get(1) }, + new FluidStack[] { GT_Values.NF }, 86400 * 20 * 2, 2_000_000_000, 13500); // Quantum anomaly recipe bypass for UXV. Avoids RNG. GT_Values.RA.addPlasmaForgeRecipe( - new ItemStack[] { - getModItem(MOD_ID_DC, "item.ChromaticLens", 1), getModItem("GoodGenerator", "huiCircuit", 1, 4) - }, - new FluidStack[] { - Materials.WhiteDwarfMatter.getMolten(144), - getFluidStack("molten.shirabon", 72), - Materials.BlackDwarfMatter.getMolten(144) - }, - new ItemStack[] {getModItem(MOD_ID_GTPP, "MU-metaitem.01", 1, 32105)}, - new FluidStack[] {NF}, + new ItemStack[] { getModItem(MOD_ID_DC, "item.ChromaticLens", 1), + getModItem("GoodGenerator", "huiCircuit", 1, 4) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(144), getFluidStack("molten.shirabon", 72), + Materials.BlackDwarfMatter.getMolten(144) }, + new ItemStack[] { getModItem(MOD_ID_GTPP, "MU-metaitem.01", 1, 32105) }, + new FluidStack[] { NF }, 50 * 20, (int) TierEU.RECIPE_UXV, 13_500); diff --git a/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java index 49f65ed8b2..e01bb1d1ce 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java @@ -2,16 +2,18 @@ package gregtech.loaders.postload.recipes; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class PrinterRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addPrinterRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java index 6dea81595c..3d5d714742 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java +++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java @@ -5,6 +5,10 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isHardcoreEnderExpansionLoaded; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isRailcraftLoaded; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -12,44 +16,38 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class Pulverizer implements Runnable { + @Override public void run() { // recycling Long Distance Pipes GT_Values.RA.addPulveriserRecipe( ItemList.Long_Distance_Pipeline_Fluid.get(1L), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 19L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 19L) }, null, 300, 4); GT_Values.RA.addPulveriserRecipe( ItemList.Long_Distance_Pipeline_Item.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 12L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 7L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 12L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 7L) }, null, 300, 4); GT_Values.RA.addPulveriserRecipe( ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1L), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 2L) }, null, 10, 4); GT_Values.RA.addPulveriserRecipe( ItemList.Long_Distance_Pipeline_Item_Pipe.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 1L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 1L) }, null, 10, 4); @@ -57,130 +55,108 @@ public class Pulverizer implements Runnable { // marbe dust( stone dust GT_Values.RA.addPulveriserRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Marble, 1L), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Marble, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Marble, 1L) }, null, 160, 4); GT_Values.RA.addPulveriserRecipe( getModItem("Thaumcraft", "ItemResource", 1, 18), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1L) }, null, 21, 4); GT_Values.RA.addPulveriserRecipe( new ItemStack(Items.reeds, 1), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L) }, null, 50, 2); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_Cupronickel.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 2) }, null, 1500, 80); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_Kanthal.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 3) }, null, 1500, 80); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_Nichrome.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 4) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 4) }, null, 1500, 80); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_TungstenSteel.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 5) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 5) }, null, 1500, 80); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_HSSG.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 6) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 6) }, null, 1500, 80); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_HSSS.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 7) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 7) }, null, 1500, 80); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_Naquadah.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 8) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 8) }, null, 1500, 80); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_NaquadahAlloy.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 9) }, null, 1500, 80); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_Trinium.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 10) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 10) }, null, 1500, 80); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_ElectrumFlux.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 11) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 11) }, null, 1500, 80); GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_AwakenedDraconium.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 12) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 12) }, null, 1500, 80); @@ -189,260 +165,220 @@ public class Pulverizer implements Runnable { // Iron GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 0), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L) }, + new int[] { 10000 }, 300, 2); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) }, + new int[] { 10000, 10000 }, 300, 2); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 2), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 12L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 12L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3L) }, + new int[] { 10000, 10000 }, 300, 2); // Steel GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 13), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2L) }, + new int[] { 10000 }, 300, 2); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 14), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) }, + new int[] { 10000, 10000 }, 300, 2); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 15), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 12L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3L) - }, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 12L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3L) }, + new int[] { 10000 }, 300, 2); // Aluminium GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2L) }, + new int[] { 10000 }, 450, 8); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) }, + new int[] { 10000, 10000 }, 450, 8); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 12L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 12L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3L) }, + new int[] { 10000, 10000 }, 450, 8); // Stainless Steel GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 3), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2L) }, + new int[] { 10000 }, 600, 16); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 4), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) }, + new int[] { 10000, 10000 }, 600, 16); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 5), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 12L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3L) - }, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 12L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3L) }, + new int[] { 10000 }, 600, 16); // Titanium GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2L) }, + new int[] { 10000 }, 600, 30); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 7), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) }, + new int[] { 10000, 10000 }, 600, 30); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 12L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3L) - }, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 12L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3L) }, + new int[] { 10000 }, 600, 30); // Tungesten Steel GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 9), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2L) }, + new int[] { 10000 }, 600, 30); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 10), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) }, + new int[] { 10000, 10000 }, 600, 30); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 11), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 12L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3L) - }, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 12L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3L) }, + new int[] { 10000 }, 600, 30); // Palladium GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2L) }, + new int[] { 10000 }, 750, 64); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 13), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) }, + new int[] { 10000, 10000 }, 750, 64); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NiobiumTitanium, 12L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NiobiumTitanium, 12L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3L) }, + new int[] { 10000, 10000 }, 750, 64); // Iridium GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 0), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2L) }, + new int[] { 10000 }, 900, 120); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) }, + new int[] { 10000, 10000 }, 900, 120); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 2), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Enderium, 12L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Enderium, 12L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3L) }, + new int[] { 10000, 10000 }, 900, 120); // Osmium GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 3), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2L) }, + new int[] { 10000 }, 1050, 256); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 4), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) }, + new int[] { 10000, 10000 }, 1050, 256); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 5), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 12L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 12L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3L) }, + new int[] { 10000, 10000 }, 1050, 256); // Neutronium GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 6), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2L) }, + new int[] { 10000 }, 1200, 480); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 7), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) - }, - new int[] {10000, 10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L) }, + new int[] { 10000, 10000 }, 1200, 480); GT_Values.RA.addPulveriserRecipe( getModItem(MOD_ID_RC, "machine.eta", 1L, 8), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 12L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3L) - }, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 12L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3L) }, + new int[] { 10000 }, 1200, 480); @@ -479,8 +415,8 @@ public class Pulverizer implements Runnable { new ItemStack(Items.string, 1), 50, false); - GT_ModHandler.addPulverisationRecipe( - new ItemStack(Blocks.red_mushroom, 1, 32767), ItemList.IC2_Grin_Powder.get(1L)); + GT_ModHandler + .addPulverisationRecipe(new ItemStack(Blocks.red_mushroom, 1, 32767), ItemList.IC2_Grin_Powder.get(1L)); GT_ModHandler.addPulverisationRecipe( new ItemStack(Items.item_frame, 1, 32767), new ItemStack(Items.leather, 1), diff --git a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java index d99d55ef4b..24ecdfd91f 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java @@ -4,6 +4,12 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isForestryLoaded; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isRailcraftLoaded; +import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; +import mods.railcraft.common.items.RailcraftToolItems; + +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -11,12 +17,9 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; -import mods.railcraft.common.items.RailcraftToolItems; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class PyrolyseRecipes implements Runnable { + @Override public void run() { if (isRailcraftLoaded) { @@ -54,15 +57,14 @@ public class PyrolyseRecipes implements Runnable { 96); } - if (!GregTech_API.mIC2Classic) - GT_Values.RA.addPyrolyseRecipe( - GT_ModHandler.getIC2Item("biochaff", 4L), - Materials.Water.getFluid(4000), - 1, - GT_Values.NI, - new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5000), - 900, - 10); + if (!GregTech_API.mIC2Classic) GT_Values.RA.addPyrolyseRecipe( + GT_ModHandler.getIC2Item("biochaff", 4L), + Materials.Water.getFluid(4000), + 1, + GT_Values.NI, + new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5000), + 900, + 10); if (isForestryLoaded) { GT_Values.RA.addPyrolyseRecipe( getModItem(GT_MachineRecipeLoader.aTextForestry, "fertilizerBio", 4L), diff --git a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java index 8390eadc2c..0f0ad6077e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java +++ b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java @@ -2,6 +2,13 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.util.GT_ModHandler.getModItem; +import java.util.Iterator; +import java.util.Map; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -12,13 +19,9 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import ic2.api.recipe.ILiquidHeatExchangerManager; import ic2.api.recipe.Recipes; -import java.util.Iterator; -import java.util.Map; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class RecipeRemover implements Runnable { + @Override public void run() { GT_ModHandler.removeRecipeByOutput(ItemList.IC2_Fertilizer.get(1L)); @@ -40,15 +43,22 @@ public class RecipeRemover implements Runnable { ic2.api.recipe.Recipes.metalformerExtruding.getRecipes(), ItemList.Cell_Empty.get(3L)); GT_Utility.removeSimpleIC2MachineRecipe( - ItemList.IC2_Energium_Dust.get(1L), ic2.api.recipe.Recipes.compressor.getRecipes(), GT_Values.NI); + ItemList.IC2_Energium_Dust.get(1L), + ic2.api.recipe.Recipes.compressor.getRecipes(), + GT_Values.NI); GT_Utility.removeSimpleIC2MachineRecipe( - new ItemStack(Items.gunpowder), ic2.api.recipe.Recipes.extractor.getRecipes(), GT_Values.NI); + new ItemStack(Items.gunpowder), + ic2.api.recipe.Recipes.extractor.getRecipes(), + GT_Values.NI); GT_Utility.removeSimpleIC2MachineRecipe( - new ItemStack(Blocks.wool, 1, 32767), ic2.api.recipe.Recipes.extractor.getRecipes(), GT_Values.NI); + new ItemStack(Blocks.wool, 1, 32767), + ic2.api.recipe.Recipes.extractor.getRecipes(), + GT_Values.NI); GT_Utility.removeSimpleIC2MachineRecipe( - new ItemStack(Blocks.gravel), ic2.api.recipe.Recipes.oreWashing.getRecipes(), GT_Values.NI); - } catch (Throwable ignored) { - } + new ItemStack(Blocks.gravel), + ic2.api.recipe.Recipes.oreWashing.getRecipes(), + GT_Values.NI); + } catch (Throwable ignored) {} GT_Utility.removeIC2BottleRecipe( GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("UranFuel", 1), @@ -77,7 +87,9 @@ public class RecipeRemover implements Runnable { GT_ModHandler.getMaceratorRecipeList(), ItemList.IC2_Plantball.get(1L)); GT_Utility.removeSimpleIC2MachineRecipe( - GT_Values.NI, GT_ModHandler.getMaceratorRecipeList(), getModItem("IC2", "itemBiochaff", 1L)); + GT_Values.NI, + GT_ModHandler.getMaceratorRecipeList(), + getModItem("IC2", "itemBiochaff", 1L)); GT_Utility.removeSimpleIC2MachineRecipe( new ItemStack(Blocks.cactus, 8, 0), @@ -89,18 +101,24 @@ public class RecipeRemover implements Runnable { getModItem("IC2", "itemFuelPlantBall", 1L)); GT_Utility.removeSimpleIC2MachineRecipe( - ItemList.Crop_Drop_BobsYerUncleRanks.get(1L), GT_ModHandler.getExtractorRecipeList(), null); + ItemList.Crop_Drop_BobsYerUncleRanks.get(1L), + GT_ModHandler.getExtractorRecipeList(), + null); GT_Utility.removeSimpleIC2MachineRecipe( - ItemList.Crop_Drop_Ferru.get(1L), GT_ModHandler.getExtractorRecipeList(), null); + ItemList.Crop_Drop_Ferru.get(1L), + GT_ModHandler.getExtractorRecipeList(), + null); GT_Utility.removeSimpleIC2MachineRecipe( - ItemList.Crop_Drop_Aurelia.get(1L), GT_ModHandler.getExtractorRecipeList(), null); + ItemList.Crop_Drop_Aurelia.get(1L), + GT_ModHandler.getExtractorRecipeList(), + null); if (!GregTech_API.mIC2Classic) { try { - Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = - ic2.api.recipe.Recipes.liquidCooldownManager.getHeatExchangeProperties(); - Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = - tLiqExchange.entrySet().iterator(); + Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = ic2.api.recipe.Recipes.liquidCooldownManager + .getHeatExchangeProperties(); + Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = tLiqExchange + .entrySet().iterator(); while (tIterator.hasNext()) { Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tEntry = tIterator.next(); if (tEntry.getKey().equals("ic2hotcoolant")) { @@ -109,14 +127,14 @@ public class RecipeRemover implements Runnable { } } } catch (Throwable e) { - /*Do nothing*/ + /* Do nothing */ } try { - Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = - ic2.api.recipe.Recipes.liquidHeatupManager.getHeatExchangeProperties(); - Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = - tLiqExchange.entrySet().iterator(); + Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = ic2.api.recipe.Recipes.liquidHeatupManager + .getHeatExchangeProperties(); + Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = tLiqExchange + .entrySet().iterator(); while (tIterator.hasNext()) { Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tEntry = tIterator.next(); if (tEntry.getKey().equals("ic2coolant")) { @@ -125,20 +143,20 @@ public class RecipeRemover implements Runnable { } } } catch (Throwable e) { - /*Do nothing*/ + /* Do nothing */ } } } public void removeSmelting() { GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Graphite, 1L)); - GT_ModHandler.removeFurnaceSmelting( - GT_OreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Graphite, 1L)); + GT_ModHandler + .removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Graphite, 1L)); GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Graphite, 1L)); - GT_ModHandler.removeFurnaceSmelting( - GT_OreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L)); - GT_ModHandler.removeFurnaceSmelting( - GT_OreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L)); + GT_ModHandler + .removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L)); + GT_ModHandler + .removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L)); GT_ModHandler.removeFurnaceSmelting(ItemList.IC2_Resin.get(1L)); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java index 342ee65c44..6ee7575a1b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java @@ -1,12 +1,13 @@ package gregtech.loaders.postload.recipes; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class SifterRecipes implements Runnable { @@ -14,28 +15,19 @@ public class SifterRecipes implements Runnable { public void run() { GT_Values.RA.addSifterRecipe( new ItemStack(Blocks.gravel, 1, 0), - new ItemStack[] { - new ItemStack(Items.flint, 1, 0), - new ItemStack(Items.flint, 1, 0), - new ItemStack(Items.flint, 1, 0), - new ItemStack(Items.flint, 1, 0), - new ItemStack(Items.flint, 1, 0), - new ItemStack(Items.flint, 1, 0) - }, - new int[] {10000, 9000, 8000, 6000, 3300, 2500}, + new ItemStack[] { new ItemStack(Items.flint, 1, 0), new ItemStack(Items.flint, 1, 0), + new ItemStack(Items.flint, 1, 0), new ItemStack(Items.flint, 1, 0), + new ItemStack(Items.flint, 1, 0), new ItemStack(Items.flint, 1, 0) }, + new int[] { 10000, 9000, 8000, 6000, 3300, 2500 }, 600, 16); GT_Values.RA.addSifterRecipe( GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Coal, 1L), - new ItemStack[] { - new ItemStack(Items.coal, 1, 0), - new ItemStack(Items.coal, 1, 0), - new ItemStack(Items.coal, 1, 0), - new ItemStack(Items.coal, 1, 0), - new ItemStack(Items.coal, 1, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L) - }, - new int[] {10000, 9000, 8000, 7000, 6000, 5000}, + new ItemStack[] { new ItemStack(Items.coal, 1, 0), new ItemStack(Items.coal, 1, 0), + new ItemStack(Items.coal, 1, 0), new ItemStack(Items.coal, 1, 0), + new ItemStack(Items.coal, 1, 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L) }, + new int[] { 10000, 9000, 8000, 7000, 6000, 5000 }, 600, 16); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java index da5fcbef0c..fa21dbaaec 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java @@ -4,6 +4,7 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; public class SlicerRecipes implements Runnable { + @Override public void run() { GT_Values.RA.addSlicerRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java index b6ac82a496..db2f540821 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java @@ -1,27 +1,30 @@ package gregtech.loaders.postload.recipes; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class SmelterRecipes implements Runnable { + @Override public void run() { GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_PotatoChips.get(1L), ItemList.Food_PotatoChips.get(1L)); GT_ModHandler.addSmeltingRecipe( - ItemList.Food_Potato_On_Stick.get(1L), ItemList.Food_Potato_On_Stick_Roasted.get(1L)); + ItemList.Food_Potato_On_Stick.get(1L), + ItemList.Food_Potato_On_Stick_Roasted.get(1L)); GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Bun.get(1L), ItemList.Food_Baked_Bun.get(1L)); GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Bread.get(1L), ItemList.Food_Baked_Bread.get(1L)); GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Baguette.get(1L), ItemList.Food_Baked_Baguette.get(1L)); - GT_ModHandler.addSmeltingRecipe( - ItemList.Food_Raw_Pizza_Veggie.get(1L), ItemList.Food_Baked_Pizza_Veggie.get(1L)); - GT_ModHandler.addSmeltingRecipe( - ItemList.Food_Raw_Pizza_Cheese.get(1L), ItemList.Food_Baked_Pizza_Cheese.get(1L)); + GT_ModHandler + .addSmeltingRecipe(ItemList.Food_Raw_Pizza_Veggie.get(1L), ItemList.Food_Baked_Pizza_Veggie.get(1L)); + GT_ModHandler + .addSmeltingRecipe(ItemList.Food_Raw_Pizza_Cheese.get(1L), ItemList.Food_Baked_Pizza_Cheese.get(1L)); GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Pizza_Meat.get(1L), ItemList.Food_Baked_Pizza_Meat.get(1L)); GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Baguette.get(1L), ItemList.Food_Baked_Baguette.get(1L)); GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Cake.get(1L), ItemList.Food_Baked_Cake.get(1L)); diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java index 9354c076b5..9ccf72fc92 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java @@ -5,6 +5,12 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isAE2Loaded; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isThaumcraftLoaded; +import java.util.Arrays; +import java.util.Collections; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -13,12 +19,9 @@ import gregtech.api.enums.TC_Aspects; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gregtech.loaders.postload.GT_MachineRecipeLoader; -import java.util.Arrays; -import java.util.Collections; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ThaumcraftRecipes implements Runnable { + @Override public void run() { if (isThaumcraftLoaded) { @@ -43,7 +46,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Charcoal Transmutation", "Turning wood into charcoal", - new String[] {"ALUMENTUM"}, + new String[] { "ALUMENTUM" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1L), 2, @@ -55,16 +58,14 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 8L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.log.get(Materials.Wood), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.log.get(Materials.Wood), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) }); tKey = "GT_FILL_WATER_BUCKET"; GT_LanguageManager.addStringLocalization( @@ -85,29 +86,28 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L), - GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Water, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))), - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Empty, 1L), - GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Water, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))), - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - GT_OreDictUnificator.get(OrePrefixes.capsule, Materials.Empty, 1L), - GT_OreDictUnificator.get(OrePrefixes.capsule, Materials.Water, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))), - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L), + GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Water, 1L), + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))), + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Empty, 1L), + GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Water, 1L), + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))), + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + GT_OreDictUnificator.get(OrePrefixes.capsule, Materials.Empty, 1L), + GT_OreDictUnificator.get(OrePrefixes.capsule, Materials.Water, 1L), + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))), + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), + Collections + .singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))) }); tKey = "GT_TRANSZINC"; GT_LanguageManager.addStringLocalization( @@ -117,7 +117,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Zinc Transmutation", "Transformation of metals into zinc", - new String[] {"TRANSTIN"}, + new String[] { "TRANSTIN" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Zinc, 1L), 2, @@ -129,16 +129,14 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Zinc), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Zinc, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Zinc), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Zinc, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))) }); tKey = "GT_TRANSANTIMONY"; GT_LanguageManager.addStringLocalization( @@ -148,7 +146,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Antimony Transmutation", "Transformation of metals into antimony", - new String[] {"GT_TRANSZINC", "TRANSLEAD"}, + new String[] { "GT_TRANSZINC", "TRANSLEAD" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Antimony, 1L), 2, @@ -160,16 +158,14 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Antimony), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Antimony, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Antimony), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Antimony, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L))) }); tKey = "GT_TRANSNICKEL"; GT_LanguageManager.addStringLocalization( @@ -179,7 +175,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Nickel Transmutation", "Transformation of metals into nickel", - new String[] {"TRANSLEAD"}, + new String[] { "TRANSLEAD" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Nickel, 1L), 2, @@ -191,16 +187,14 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Nickel), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Nickel, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Nickel), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Nickel, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) }); tKey = "GT_TRANSCOBALT"; GT_LanguageManager.addStringLocalization( @@ -210,7 +204,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Cobalt Transmutation", "Transformation of metals into cobalt", - new String[] {"GT_TRANSNICKEL"}, + new String[] { "GT_TRANSNICKEL" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Cobalt, 1L), 2, @@ -222,16 +216,14 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Cobalt), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Cobalt, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Cobalt), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Cobalt, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) }); tKey = "GT_TRANSBISMUTH"; GT_LanguageManager.addStringLocalization( @@ -241,7 +233,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Bismuth Transmutation", "Transformation of metals into bismuth", - new String[] {"GT_TRANSCOBALT"}, + new String[] { "GT_TRANSCOBALT" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Bismuth, 1L), 2, @@ -253,16 +245,14 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Bismuth), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Bismuth, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Bismuth), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Bismuth, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) }); tKey = "GT_IRON_TO_STEEL"; GT_LanguageManager.addStringLocalization( @@ -272,7 +262,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Steel Transmutation", "Transforming iron to steel", - new String[] {"TRANSIRON", "GT_WOOD_TO_CHARCOAL"}, + new String[] { "TRANSIRON", "GT_WOOD_TO_CHARCOAL" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L), 3, @@ -284,14 +274,13 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Iron), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Iron), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L), + Collections + .singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))) }); tKey = "GT_TRANSBRONZE"; GT_LanguageManager.addStringLocalization( @@ -301,7 +290,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Bronze Transmutation", "Transformation of metals into bronze", - new String[] {"TRANSTIN", "TRANSCOPPER"}, + new String[] { "TRANSTIN", "TRANSCOPPER" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Bronze, 1L), 2, @@ -313,16 +302,14 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Bronze), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Bronze, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Bronze), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Bronze, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) }); tKey = "GT_TRANSELECTRUM"; GT_LanguageManager.addStringLocalization( @@ -332,7 +319,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Electrum Transmutation", "Transformation of metals into electrum", - new String[] {"GT_TRANSBRONZE", "TRANSGOLD", "TRANSSILVER"}, + new String[] { "GT_TRANSBRONZE", "TRANSGOLD", "TRANSSILVER" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Electrum, 1L), 2, @@ -344,16 +331,14 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Electrum), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Electrum, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Electrum), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Electrum, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))) }); tKey = "GT_TRANSBRASS"; GT_LanguageManager.addStringLocalization( @@ -363,7 +348,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Brass Transmutation", "Transformation of metals into brass", - new String[] {"GT_TRANSBRONZE", "GT_TRANSZINC"}, + new String[] { "GT_TRANSBRONZE", "GT_TRANSZINC" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Brass, 1L), 2, @@ -375,16 +360,14 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Brass), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Brass, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Brass), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Brass, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) }); tKey = "GT_TRANSINVAR"; GT_LanguageManager.addStringLocalization( @@ -394,7 +377,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Invar Transmutation", "Transformation of metals into invar", - new String[] {"GT_TRANSBRONZE", "GT_TRANSNICKEL"}, + new String[] { "GT_TRANSBRONZE", "GT_TRANSNICKEL" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Invar, 1L), 2, @@ -406,16 +389,14 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Invar), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Invar, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Invar), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Invar, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L))) }); tKey = "GT_TRANSCUPRONICKEL"; GT_LanguageManager.addStringLocalization( @@ -425,7 +406,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Cupronickel Transmutation", "Transformation of metals into cupronickel", - new String[] {"GT_TRANSBRONZE", "GT_TRANSNICKEL"}, + new String[] { "GT_TRANSBRONZE", "GT_TRANSNICKEL" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Cupronickel, 1L), 2, @@ -438,17 +419,15 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Cupronickel), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Cupronickel, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Cupronickel), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Cupronickel, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) }); tKey = "GT_TRANSBATTERYALLOY"; GT_LanguageManager.addStringLocalization( @@ -458,7 +437,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Battery Alloy Transmutation", "Transformation of metals into battery alloy", - new String[] {"GT_TRANSBRONZE", "GT_TRANSANTIMONY"}, + new String[] { "GT_TRANSBRONZE", "GT_TRANSANTIMONY" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.BatteryAlloy, 1L), 2, @@ -471,17 +450,15 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.BatteryAlloy), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.BatteryAlloy, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.BatteryAlloy), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.BatteryAlloy, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))) }); tKey = "GT_TRANSSOLDERINGALLOY"; GT_LanguageManager.addStringLocalization( @@ -491,7 +468,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Soldering Alloy Transmutation", "Transformation of metals into soldering alloy", - new String[] {"GT_TRANSBRONZE", "GT_TRANSANTIMONY"}, + new String[] { "GT_TRANSBRONZE", "GT_TRANSANTIMONY" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.SolderingAlloy, 1L), 2, @@ -504,17 +481,15 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.SolderingAlloy), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.SolderingAlloy, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.SolderingAlloy), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.SolderingAlloy, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L))) }); tKey = "GT_ADVANCEDMETALLURGY"; GT_LanguageManager.addStringLocalization( @@ -524,16 +499,9 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Advanced Metallurgic Transmutation", "Mastering the basic metals", - new String[] { - "GT_TRANSBISMUTH", - "GT_IRON_TO_STEEL", - "GT_TRANSSOLDERINGALLOY", - "GT_TRANSBATTERYALLOY", - "GT_TRANSBRASS", - "GT_TRANSELECTRUM", - "GT_TRANSCUPRONICKEL", - "GT_TRANSINVAR" - }, + new String[] { "GT_TRANSBISMUTH", "GT_IRON_TO_STEEL", "GT_TRANSSOLDERINGALLOY", + "GT_TRANSBATTERYALLOY", "GT_TRANSBRASS", "GT_TRANSELECTRUM", "GT_TRANSCUPRONICKEL", + "GT_TRANSINVAR" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), 3, @@ -548,7 +516,7 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 20L)), null, - new Object[] {GT_MachineRecipeLoader.aTextTCGTPage + tKey}); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey }); tKey = "GT_TRANSALUMINIUM"; GT_LanguageManager.addStringLocalization( @@ -558,7 +526,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Aluminium Transmutation", "Transformation of metals into aluminium", - new String[] {"GT_ADVANCEDMETALLURGY"}, + new String[] { "GT_ADVANCEDMETALLURGY" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 1L), 4, @@ -572,18 +540,16 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.nugget.get(Materials.Aluminium), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.nugget.get(Materials.Aluminium), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) }); if (isAE2Loaded) { tKey = "GT_TRANSSKYSTONE"; @@ -594,7 +560,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Skystone Transmutation", "Transformation of obsidian into skystone", - new String[] {"GT_ADVANCEDMETALLURGY"}, + new String[] { "GT_ADVANCEDMETALLURGY" }, "ALCHEMY", getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), 4, @@ -608,19 +574,17 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - new ItemStack(Blocks.obsidian), - getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + new ItemStack(Blocks.obsidian), + getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 1L))) }); } tKey = "GT_TRANSMINERAL"; @@ -631,7 +595,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Basaltic Mineral Transmutation", "Transformation of mineral sands", - new String[] {"GT_ADVANCEDMETALLURGY"}, + new String[] { "GT_ADVANCEDMETALLURGY" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L), 4, @@ -645,27 +609,25 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1L))), - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 1L), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1L))), + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 1L), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1L))) }); tKey = "GT_CRYSTALLISATION"; GT_LanguageManager.addStringLocalization( @@ -675,7 +637,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Shard Recrystallisation", "Fixing your precious crystals", - new String[] {"ALCHEMICALMANUFACTURE"}, + new String[] { "ALCHEMICALMANUFACTURE" }, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1L), 3, @@ -687,44 +649,48 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.dust.get(Materials.Amber), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Amber, 1L), - Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.dust.get(Materials.InfusedOrder), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.dust.get(Materials.InfusedEntropy), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.dust.get(Materials.InfusedAir), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.dust.get(Materials.InfusedEarth), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.dust.get(Materials.InfusedFire), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - OrePrefixes.dust.get(Materials.InfusedWater), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1L), - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.dust.get(Materials.Amber), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Amber, 1L), + Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.dust.get(Materials.InfusedOrder), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1L), + Collections + .singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.dust.get(Materials.InfusedEntropy), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1L), + Collections + .singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.dust.get(Materials.InfusedAir), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1L), + Collections + .singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.dust.get(Materials.InfusedEarth), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1L), + Collections + .singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.dust.get(Materials.InfusedFire), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1L), + Collections + .singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))), + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + OrePrefixes.dust.get(Materials.InfusedWater), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1L), + Collections.singletonList( + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))) }); tKey = "GT_MAGICENERGY"; GT_LanguageManager.addStringLocalization( @@ -734,7 +700,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Magic Energy Conversion", "Magic to Power", - new String[] {"ARCANEBORE"}, + new String[] { "ARCANEBORE" }, "ARTIFICE", ItemList.MagicEnergyConverter_LV.get(1L), 3, @@ -747,27 +713,23 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - tKey, - ItemList.Hull_LV.get(1L), - new ItemStack[] { - new ItemStack(Blocks.beacon), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), - ItemList.Sensor_MV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), - ItemList.Sensor_MV.get(2L) - }, - ItemList.MagicEnergyConverter_LV.get(1L), - 5, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + tKey, + ItemList.Hull_LV.get(1L), + new ItemStack[] { new ItemStack(Blocks.beacon), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), + ItemList.Sensor_MV.get(2L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), + ItemList.Sensor_MV.get(2L) }, + ItemList.MagicEnergyConverter_LV.get(1L), + 5, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L))) }); tKey = "GT_MAGICENERGY2"; GT_LanguageManager.addStringLocalization( @@ -777,7 +739,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Adept Magic Energy Conversion", "Magic to Power", - new String[] {"GT_MAGICENERGY"}, + new String[] { "GT_MAGICENERGY" }, "ARTIFICE", ItemList.MagicEnergyConverter_MV.get(1L), 1, @@ -790,27 +752,25 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - tKey, - ItemList.Hull_MV.get(1L), - new ItemStack[] { - new ItemStack(Blocks.beacon), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Thaumium, 1L), - ItemList.Sensor_HV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 1L), - ItemList.Sensor_HV.get(2L) - }, - ItemList.MagicEnergyConverter_MV.get(1L), - 6, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + tKey, + ItemList.Hull_MV.get(1L), + new ItemStack[] { new ItemStack(Blocks.beacon), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + GT_OreDictUnificator + .get(OrePrefixes.plateDouble, Materials.Thaumium, 1L), + ItemList.Sensor_HV.get(2L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + GT_OreDictUnificator + .get(OrePrefixes.plateDouble, Materials.StainlessSteel, 1L), + ItemList.Sensor_HV.get(2L) }, + ItemList.MagicEnergyConverter_MV.get(1L), + 6, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L))) }); tKey = "GT_MAGICENERGY3"; GT_LanguageManager.addStringLocalization( @@ -820,7 +780,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Master Magic Energy Conversion", "Magic to Power", - new String[] {"GT_MAGICENERGY2"}, + new String[] { "GT_MAGICENERGY2" }, "ARTIFICE", ItemList.MagicEnergyConverter_HV.get(1L), 1, @@ -833,27 +793,25 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 40L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 20L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - tKey, - ItemList.Hull_HV.get(1L), - new ItemStack[] { - new ItemStack(Blocks.beacon), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1L), - ItemList.Field_Generator_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 1L), - ItemList.Field_Generator_MV.get(1L) - }, - ItemList.MagicEnergyConverter_HV.get(1L), - 8, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + tKey, + ItemList.Hull_HV.get(1L), + new ItemStack[] { new ItemStack(Blocks.beacon), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator + .get(OrePrefixes.plateDense, Materials.Thaumium, 1L), + ItemList.Field_Generator_MV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator + .get(OrePrefixes.plateDense, Materials.Titanium, 1L), + ItemList.Field_Generator_MV.get(1L) }, + ItemList.MagicEnergyConverter_HV.get(1L), + 8, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L))) }); tKey = "GT_MAGICABSORB"; GT_LanguageManager.addStringLocalization( @@ -863,7 +821,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, "Magic Energy Absorption", "Harvesting Magic", - new String[] {"GT_MAGICENERGY"}, + new String[] { "GT_MAGICENERGY" }, "ARTIFICE", ItemList.MagicEnergyAbsorber_LV.get(1L), 3, @@ -876,36 +834,33 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - tKey, - ItemList.Hull_LV.get(1L), - new ItemStack[] { - ItemList.MagicEnergyConverter_LV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), - ItemList.Sensor_MV.get(2L) - }, - ItemList.MagicEnergyAbsorber_LV.get(1L), - 6, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 16L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 32L), - new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 4L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + tKey, + ItemList.Hull_LV.get(1L), + new ItemStack[] { ItemList.MagicEnergyConverter_LV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), + ItemList.Sensor_MV.get(2L) }, + ItemList.MagicEnergyAbsorber_LV.get(1L), + 6, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 32L), + new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 4L))) }); tKey = "GT_MAGICABSORB2"; GT_LanguageManager.addStringLocalization( - GT_MachineRecipeLoader.aTextTCGTPage + tKey, "Moar output! Drain all the Magic!"); + GT_MachineRecipeLoader.aTextTCGTPage + tKey, + "Moar output! Drain all the Magic!"); GregTech_API.sThaumcraftCompat.addResearch( tKey, "Improved Magic Energy Absorption", "Harvesting Magic", - new String[] {"GT_MAGICABSORB"}, + new String[] { "GT_MAGICABSORB" }, "ARTIFICE", ItemList.MagicEnergyAbsorber_EV.get(1L), 3, @@ -918,71 +873,64 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - tKey, - ItemList.Hull_MV.get(1L), - new ItemStack[] { - ItemList.MagicEnergyConverter_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), - ItemList.Sensor_HV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L) - }, - ItemList.MagicEnergyAbsorber_MV.get(1L), - 6, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 32L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 8L))), - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - tKey, - ItemList.Hull_HV.get(1L), - new ItemStack[] { - ItemList.MagicEnergyConverter_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), - ItemList.Field_Generator_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), - }, - ItemList.MagicEnergyAbsorber_HV.get(1L), - 8, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 128L), - new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 16L))), - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - tKey, - ItemList.Hull_EV.get(1L), - new ItemStack[] { - ItemList.MagicEnergyConverter_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1), - ItemList.Field_Generator_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1), - }, - ItemList.MagicEnergyAbsorber_EV.get(1L), - 10, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 128L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 256L), - new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 64L))) - }); + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + tKey, + ItemList.Hull_MV.get(1L), + new ItemStack[] { ItemList.MagicEnergyConverter_MV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), + ItemList.Sensor_HV.get(2L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L) }, + ItemList.MagicEnergyAbsorber_MV.get(1L), + 6, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 32L), + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 8L))), + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + tKey, + ItemList.Hull_HV.get(1L), + new ItemStack[] { ItemList.MagicEnergyConverter_MV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), + ItemList.Field_Generator_MV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), }, + ItemList.MagicEnergyAbsorber_HV.get(1L), + 8, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 128L), + new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 16L))), + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + tKey, + ItemList.Hull_EV.get(1L), + new ItemStack[] { ItemList.MagicEnergyConverter_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1), + ItemList.Field_Generator_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), + GT_OreDictUnificator + .get(OrePrefixes.plate, Materials.TungstenSteel, 1), }, + ItemList.MagicEnergyAbsorber_EV.get(1L), + 10, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 128L), + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 256L), + new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 64L))) }); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java index 3723ebd6d7..654e9a2004 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java @@ -2,12 +2,13 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.GT_Values.RA; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ThermalCentrifugeRecipes implements Runnable { diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index 3be8d32b50..2a0a530986 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java @@ -2,17 +2,19 @@ package gregtech.loaders.postload.recipes; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isGTPPLoaded; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class VacuumFreezerRecipes implements Runnable { + @Override public void run() { // reactor parts vacuum @@ -69,27 +71,49 @@ public class VacuumFreezerRecipes implements Runnable { GT_ModHandler.getIC2Item("reactorCoolantSix", 1L, 1), 600); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_He_1.getWildcard(1L), ItemList.Reactor_Coolant_He_1.get(1L), 600); + ItemList.Reactor_Coolant_He_1.getWildcard(1L), + ItemList.Reactor_Coolant_He_1.get(1L), + 600); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_He_3.getWildcard(1L), ItemList.Reactor_Coolant_He_3.get(1L), 1800); + ItemList.Reactor_Coolant_He_3.getWildcard(1L), + ItemList.Reactor_Coolant_He_3.get(1L), + 1800); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_He_6.getWildcard(1L), ItemList.Reactor_Coolant_He_6.get(1L), 3600); + ItemList.Reactor_Coolant_He_6.getWildcard(1L), + ItemList.Reactor_Coolant_He_6.get(1L), + 3600); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_NaK_1.getWildcard(1L), ItemList.Reactor_Coolant_NaK_1.get(1L), 600); + ItemList.Reactor_Coolant_NaK_1.getWildcard(1L), + ItemList.Reactor_Coolant_NaK_1.get(1L), + 600); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_NaK_3.getWildcard(1L), ItemList.Reactor_Coolant_NaK_3.get(1L), 1800); + ItemList.Reactor_Coolant_NaK_3.getWildcard(1L), + ItemList.Reactor_Coolant_NaK_3.get(1L), + 1800); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_NaK_6.getWildcard(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), 3600); + ItemList.Reactor_Coolant_NaK_6.getWildcard(1L), + ItemList.Reactor_Coolant_NaK_6.get(1L), + 3600); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.neutroniumHeatCapacitor.getWildcard(1L), ItemList.neutroniumHeatCapacitor.get(1L), 10000000); + ItemList.neutroniumHeatCapacitor.getWildcard(1L), + ItemList.neutroniumHeatCapacitor.get(1L), + 10000000); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_Sp_1.getWildcard(1L), ItemList.Reactor_Coolant_Sp_1.get(1L), 1800); + ItemList.Reactor_Coolant_Sp_1.getWildcard(1L), + ItemList.Reactor_Coolant_Sp_1.get(1L), + 1800); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_Sp_2.getWildcard(1L), ItemList.Reactor_Coolant_Sp_2.get(1L), 3600); + ItemList.Reactor_Coolant_Sp_2.getWildcard(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L), + 3600); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_Sp_3.getWildcard(1L), ItemList.Reactor_Coolant_Sp_3.get(1L), 5400); + ItemList.Reactor_Coolant_Sp_3.getWildcard(1L), + ItemList.Reactor_Coolant_Sp_3.get(1L), + 5400); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_Sp_6.getWildcard(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), 10800); + ItemList.Reactor_Coolant_Sp_6.getWildcard(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), + 10800); // fluid vacuum GT_Values.RA.addVacuumFreezerRecipe( @@ -113,13 +137,21 @@ public class VacuumFreezerRecipes implements Runnable { 480); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_Sp_1.getWildcard(1L), ItemList.Reactor_Coolant_Sp_1.get(1L), 1800); + ItemList.Reactor_Coolant_Sp_1.getWildcard(1L), + ItemList.Reactor_Coolant_Sp_1.get(1L), + 1800); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_Sp_2.getWildcard(1L), ItemList.Reactor_Coolant_Sp_2.get(1L), 3600); + ItemList.Reactor_Coolant_Sp_2.getWildcard(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L), + 3600); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_Sp_3.getWildcard(1L), ItemList.Reactor_Coolant_Sp_3.get(1L), 5400); + ItemList.Reactor_Coolant_Sp_3.getWildcard(1L), + ItemList.Reactor_Coolant_Sp_3.get(1L), + 5400); GT_Values.RA.addVacuumFreezerRecipe( - ItemList.Reactor_Coolant_Sp_6.getWildcard(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), 10800); + ItemList.Reactor_Coolant_Sp_6.getWildcard(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), + 10800); // Freeze superconductors. GT_Values.RA.addVacuumFreezerRecipe( @@ -148,7 +180,9 @@ public class VacuumFreezerRecipes implements Runnable { Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, 1L), GT_OreDictUnificator.get( - OrePrefixes.ingot, Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, 1L), + OrePrefixes.ingot, + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, + 1L), 400, 30720); GT_Values.RA.addVacuumFreezerRecipe( @@ -212,13 +246,11 @@ public class VacuumFreezerRecipes implements Runnable { if (isGTPPLoaded) { GT_Values.RA.addVacuumFreezerRecipe( - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.TranscendentMetal, 1L)}, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("molten.titansteel"), 144), - Materials.SuperCoolant.getFluid(1000) - }, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TranscendentMetal, 1L)}, - new FluidStack[] {GT_Values.NF}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.TranscendentMetal, 1L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.titansteel"), 144), + Materials.SuperCoolant.getFluid(1000) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TranscendentMetal, 1L) }, + new FluidStack[] { GT_Values.NF }, 50 * 20, 32_000_000); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java index b7e3fd037f..463f190c23 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java @@ -1,5 +1,8 @@ package gregtech.loaders.postload.recipes; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -7,14 +10,13 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_RecipeRegistrator; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class WiremillRecipes implements Runnable { + @Override public void run() { - GT_RecipeRegistrator.registerWiremillRecipes( - Materials.Graphene, 400, 2, OrePrefixes.dust, OrePrefixes.stick, 1); + GT_RecipeRegistrator + .registerWiremillRecipes(Materials.Graphene, 400, 2, OrePrefixes.dust, OrePrefixes.stick, 1); GT_RecipeRegistrator.registerWiremillRecipes(Materials.SpaceTime, 400, 32_000); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java b/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java index 4b1ef8098c..b68ac34c44 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java @@ -4,6 +4,7 @@ import gregtech.api.util.GT_Log; import gregtech.common.redstonecircuits.*; public class GT_Loader_CircuitBehaviors implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Register Redstone Circuit behaviours."); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java index a8d29940b4..fc9f7d936d 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java @@ -2,6 +2,10 @@ package gregtech.loaders.preload; import static gregtech.api.enums.GT_Values.MOD_ID_DC; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -11,11 +15,9 @@ import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class GT_Loader_ItemData implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Loading Item Data Tags"); @@ -57,7 +59,8 @@ public class GT_Loader_ItemData implements Runnable { GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 12), new ItemData(Materials.Fluix, 1814400L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.quartz_block, 1, 32767), new ItemData(Materials.NetherQuartz, 14515200L)); + new ItemStack(Blocks.quartz_block, 1, 32767), + new ItemData(Materials.NetherQuartz, 14515200L)); GT_OreDictUnificator.addItemData( GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartz", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); @@ -68,13 +71,13 @@ public class GT_Loader_ItemData implements Runnable { GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.wheat, 1, 32767), new ItemData(Materials.Wheat, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.hay_block, 1, 32767), new ItemData(Materials.Wheat, 32659200L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.hay_block, 1, 32767), new ItemData(Materials.Wheat, 32659200L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.glowstone, 1, 32767), new ItemData(Materials.Glowstone, 14515200L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.glowstone, 1, 32767), new ItemData(Materials.Glowstone, 14515200L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.redstone_lamp, 1, 32767), new ItemData( @@ -88,46 +91,49 @@ public class GT_Loader_ItemData implements Runnable { 14515200L, new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Forestry", "craftingMaterial", 1L, 5), new ItemData(Materials.Ice, 3628800L)); + GT_ModHandler.getModItem("Forestry", "craftingMaterial", 1L, 5), + new ItemData(Materials.Ice, 3628800L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.clay_ball, 1, 32767), new ItemData(Materials.Clay, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.clay_ball, 1, 32767), new ItemData(Materials.Clay, 1814400L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.clay, 1, 32767), new ItemData(Materials.Clay, 7257600L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stained_hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.brick_block, 1, 32767), new ItemData(Materials.Brick, 3628800L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("Uran238", 1L), new ItemData(Materials.Uranium, 3628800L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("Uran235", 1L), new ItemData(Materials.Uranium235, 3628800L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("Plutonium", 1L), new ItemData(Materials.Plutonium, 3628800L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("smallUran235", 1L), new ItemData(Materials.Uranium235, 403200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("smallPlutonium", 1L), new ItemData(Materials.Plutonium, 403200L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stained_hardened_clay, 1, 32767), + new ItemData(Materials.Clay, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.brick_block, 1, 32767), new ItemData(Materials.Brick, 3628800L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("Uran238", 1L), new ItemData(Materials.Uranium, 3628800L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("Uran235", 1L), new ItemData(Materials.Uranium235, 3628800L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("Plutonium", 1L), new ItemData(Materials.Plutonium, 3628800L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("smallUran235", 1L), new ItemData(Materials.Uranium235, 403200L)); + GT_OreDictUnificator.addItemData( + GT_ModHandler.getIC2Item("smallPlutonium", 1L), + new ItemData(Materials.Plutonium, 403200L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Iron.get(1L), new ItemData(Materials.Iron, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Gold.get(1L), new ItemData(Materials.Gold, 1814400L)); - GT_OreDictUnificator.addItemData( - ItemList.IC2_Item_Casing_Bronze.get(1L), new ItemData(Materials.Bronze, 1814400L)); - GT_OreDictUnificator.addItemData( - ItemList.IC2_Item_Casing_Copper.get(1L), new ItemData(Materials.Copper, 1814400L)); + GT_OreDictUnificator + .addItemData(ItemList.IC2_Item_Casing_Bronze.get(1L), new ItemData(Materials.Bronze, 1814400L)); + GT_OreDictUnificator + .addItemData(ItemList.IC2_Item_Casing_Copper.get(1L), new ItemData(Materials.Copper, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Tin.get(1L), new ItemData(Materials.Tin, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Lead.get(1L), new ItemData(Materials.Lead, 1814400L)); - GT_OreDictUnificator.addItemData( - ItemList.IC2_Item_Casing_Steel.get(1L), new ItemData(Materials.Steel, 1814400L)); + GT_OreDictUnificator + .addItemData(ItemList.IC2_Item_Casing_Steel.get(1L), new ItemData(Materials.Steel, 1814400L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.written_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.writable_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.enchanted_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.written_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.writable_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.enchanted_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); GT_OreDictUnificator.addItemData( new ItemStack(Items.golden_apple, 1, 1), new ItemData(Materials.Gold, OrePrefixes.block.mMaterialAmount * 8L)); @@ -143,18 +149,21 @@ public class GT_Loader_ItemData implements Runnable { GT_OreDictUnificator.addItemData(new ItemStack(Items.minecart, 1), new ItemData(Materials.Iron, 18144000L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.cauldron, 1), new ItemData(Materials.Iron, 25401600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.iron_bars, 8, 32767), new ItemData(Materials.Iron, 10886400L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.iron_bars, 8, 32767), new ItemData(Materials.Iron, 10886400L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(MOD_ID_DC, "item.SteelBars", 8L, 0), new ItemData(Materials.Steel, 10886400L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("ironFurnace", 1L), new ItemData(Materials.Iron, 18144000L)); + GT_ModHandler.getModItem(MOD_ID_DC, "item.SteelBars", 8L, 0), + new ItemData(Materials.Steel, 10886400L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("ironFurnace", 1L), new ItemData(Materials.Iron, 18144000L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Food_Can_Empty.get(1L), new ItemData(Materials.Tin, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Fuel_Rod_Empty.get(1L), new ItemData(Materials.Iron, 3628800L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767), new ItemData(Materials.Gold, 7257600L)); + new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767), + new ItemData(Materials.Gold, 7257600L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), new ItemData(Materials.Iron, 7257600L)); + new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), + new ItemData(Materials.Iron, 7257600L)); GT_OreDictUnificator.addItemData( GT_ModHandler.getModItem("Railcraft", "tile.railcraft.anvil", 1L, 0), new ItemData(Materials.Steel, 108864000L)); @@ -179,16 +188,17 @@ public class GT_Loader_ItemData implements Runnable { OrePrefixes.ring.mMaterialAmount * 2L, new MaterialStack(Materials.Wood, 3628800L))); GT_OreDictUnificator.addItemData(ItemList.Bottle_Empty.get(1L), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.potionitem, 1, 32767), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stained_glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stained_glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.potionitem, 1, 32767), new ItemData(Materials.Glass, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stained_glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stained_glass_pane, 1, 32767), + new ItemData(Materials.Glass, 1360800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L)); GT_OreDictUnificator.addItemData( new ItemStack(Items.clock, 1, 32767), new ItemData(Materials.Gold, 14515200L, new MaterialStack(Materials.Redstone, 3628800L))); @@ -204,8 +214,8 @@ public class GT_Loader_ItemData implements Runnable { GT_OreDictUnificator.addItemData( new ItemStack(Items.diamond_horse_armor, 1, 32767), new ItemData(Materials.Diamond, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.leather, 1, 32767), new ItemData(Materials.Leather, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.leather, 1, 32767), new ItemData(Materials.Leather, 3628800L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.beacon, 1, 32767), new ItemData( @@ -230,84 +240,87 @@ public class GT_Loader_ItemData implements Runnable { new ItemStack(Blocks.lever, 1, 32767), new ItemData(Materials.Stone, 3628800L, new MaterialStack(Materials.Wood, 1814400L))); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow_layer, 1, 32767), new ItemData(Materials.Snow, -1L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.sand, 1, 32767), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.sandstone, 1, 32767), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 0), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 8), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 0), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 8), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 1), new ItemData(Materials.Sand, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 9), new ItemData(Materials.Sand, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 1), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 9), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 2), new ItemData(Materials.Wood, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 10), new ItemData(Materials.Wood, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 2), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 10), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 3), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 11), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 3), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 11), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 5), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 13), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 5), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 13), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.lit_furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stonebrick, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.mossy_cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_button, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_pressure_plate, 1, 32767), new ItemData(Materials.Stone, 7257600L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.ladder, 1, 32767), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.wooden_button, 1, 32767), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.wooden_pressure_plate, 1, 32767), new ItemData(Materials.Wood, 7257600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.sandstone, 1, 32767), new ItemData(Materials.Sand, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 0), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 8), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 0), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 8), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 1), new ItemData(Materials.Sand, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 9), new ItemData(Materials.Sand, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 1), new ItemData(Materials.Sand, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 9), new ItemData(Materials.Sand, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 2), new ItemData(Materials.Wood, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 10), new ItemData(Materials.Wood, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 2), new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 10), new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 3), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 11), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 3), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 11), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 5), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 13), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 5), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 13), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.lit_furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stonebrick, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.mossy_cobblestone, 1, 32767), + new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_button, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_pressure_plate, 1, 32767), + new ItemData(Materials.Stone, 7257600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.ladder, 1, 32767), new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.wooden_button, 1, 32767), new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.wooden_pressure_plate, 1, 32767), + new ItemData(Materials.Wood, 7257600L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.fence, 1, 32767), new ItemData(Materials.Wood, 5443200L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.bowl, 1, 32767), new ItemData(Materials.Wood, 3628800L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.sign, 1, 32767), new ItemData(Materials.Wood, 7257600L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.chest, 1, 32767), new ItemData(Materials.Wood, 29030400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.chest, 1, 32767), new ItemData(Materials.Wood, 29030400L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.trapped_chest, 1, 32767), new ItemData( @@ -326,8 +339,8 @@ public class GT_Loader_ItemData implements Runnable { GT_OreDictUnificator.addItemData( new ItemStack(Blocks.jukebox, 1, 32767), new ItemData(Materials.Wood, 29030400L, new MaterialStack(Materials.Diamond, 3628800L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.crafting_table, 1, 32767), new ItemData(Materials.Wood, 14515200L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.crafting_table, 1, 32767), new ItemData(Materials.Wood, 14515200L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.piston, 1, 32767), new ItemData(Materials.Stone, 14515200L, new MaterialStack(Materials.Wood, 10886400L))); @@ -352,28 +365,19 @@ public class GT_Loader_ItemData implements Runnable { GT_OreDictUnificator.addItemData( GT_ModHandler.getModItem("Thaumcraft", "ItemNuggetFish", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); - for (ItemStack tItem : new ItemStack[] { - GT_ModHandler.getModItem("TwilightForest", "item.meefRaw", 1L, 0), - GT_ModHandler.getModItem("TwilightForest", "item.venisonRaw", 1L, 0), - new ItemStack(Items.porkchop), - new ItemStack(Items.beef), - new ItemStack(Items.chicken), - new ItemStack(Items.fish) - }) { + for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem("TwilightForest", "item.meefRaw", 1L, 0), + GT_ModHandler.getModItem("TwilightForest", "item.venisonRaw", 1L, 0), new ItemStack(Items.porkchop), + new ItemStack(Items.beef), new ItemStack(Items.chicken), new ItemStack(Items.fish) }) { if (tItem != null) { GT_OreDictUnificator.addItemData( GT_Utility.copyMetaData(32767L, tItem), new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } } - for (ItemStack tItem : new ItemStack[] { - GT_ModHandler.getModItem("TwilightForest", "item.meefSteak", 1L, 0), - GT_ModHandler.getModItem("TwilightForest", "item.venisonCooked", 1L, 0), - new ItemStack(Items.cooked_porkchop), - new ItemStack(Items.cooked_beef), - new ItemStack(Items.cooked_chicken), - new ItemStack(Items.cooked_fished) - }) { + for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem("TwilightForest", "item.meefSteak", 1L, 0), + GT_ModHandler.getModItem("TwilightForest", "item.venisonCooked", 1L, 0), + new ItemStack(Items.cooked_porkchop), new ItemStack(Items.cooked_beef), + new ItemStack(Items.cooked_chicken), new ItemStack(Items.cooked_fished) }) { if (tItem != null) { GT_OreDictUnificator.addItemData( GT_Utility.copyMetaData(32767L, tItem), diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 37640192b1..59da1c074b 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -5,6 +5,16 @@ import static gregtech.api.enums.FluidState.LIQUID; import static gregtech.api.enums.FluidState.MOLTEN; import static gregtech.api.enums.FluidState.SLURRY; +import java.util.Locale; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; + import codechicken.nei.api.API; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry; @@ -41,20 +51,12 @@ import gregtech.common.items.GT_MetaGenerated_Item_99; import gregtech.common.items.GT_MetaGenerated_Tool_01; import gregtech.common.items.GT_NeutronReflector_Item; import gregtech.common.items.GT_VolumetricFlask; -import java.util.Locale; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; public class GT_Loader_Item_Block_And_Fluid implements Runnable { + @Override public void run() { - Materials.Water.mFluid = - (Materials.Ice.mFluid = GT_ModHandler.getWater(1000L).getFluid()); + Materials.Water.mFluid = (Materials.Ice.mFluid = GT_ModHandler.getWater(1000L).getFluid()); Materials.Lava.mFluid = GT_ModHandler.getLava(1000L).getFluid(); GT_Log.out.println("GT_Mod: Register Books."); @@ -128,93 +130,109 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.VOLUMETRIC_FLASK.set(new GT_VolumetricFlask("Volumetric_Flask", "Volumetric flask", 1000)); - Item tItem = (Item) - GT_Utility.callConstructor("gregtech.common.items.GT_SensorCard_Item", 0, null, false, new Object[] { - "sensorcard", "GregTech Sensor Card" - }); + Item tItem = (Item) GT_Utility.callConstructor( + "gregtech.common.items.GT_SensorCard_Item", + 0, + null, + false, + new Object[] { "sensorcard", "GregTech Sensor Card" }); ItemList.NC_SensorCard.set( tItem == null ? new GT_Generic_Item( - "sensorcard", "GregTech Sensor Card", "Nuclear Control not installed", false) + "sensorcard", + "GregTech Sensor Card", + "Nuclear Control not installed", + false) : tItem); - ItemList.Neutron_Reflector.set( - new GT_NeutronReflector_Item("neutronreflector", "Iridium Neutron Reflector", 0)); - ItemList.Reactor_Coolant_He_1.set( - GregTech_API.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); - ItemList.Reactor_Coolant_He_3.set( - GregTech_API.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); - ItemList.Reactor_Coolant_He_6.set( - GregTech_API.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); - ItemList.Reactor_Coolant_NaK_1.set( - GregTech_API.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); - ItemList.Reactor_Coolant_NaK_3.set( - GregTech_API.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); - ItemList.Reactor_Coolant_NaK_6.set( - GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); - - ItemList.Reactor_Coolant_Sp_1.set( - GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); - - ItemList.Reactor_Coolant_Sp_2.set( - GregTech_API.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); - - ItemList.Reactor_Coolant_Sp_3.set( - GregTech_API.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); + ItemList.Neutron_Reflector + .set(new GT_NeutronReflector_Item("neutronreflector", "Iridium Neutron Reflector", 0)); + ItemList.Reactor_Coolant_He_1 + .set(GregTech_API.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); + ItemList.Reactor_Coolant_He_3 + .set(GregTech_API.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); + ItemList.Reactor_Coolant_He_6 + .set(GregTech_API.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); + ItemList.Reactor_Coolant_NaK_1 + .set(GregTech_API.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); + ItemList.Reactor_Coolant_NaK_3 + .set(GregTech_API.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); + ItemList.Reactor_Coolant_NaK_6 + .set(GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); + + ItemList.Reactor_Coolant_Sp_1 + .set(GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); + + ItemList.Reactor_Coolant_Sp_2 + .set(GregTech_API.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); + + ItemList.Reactor_Coolant_Sp_3 + .set(GregTech_API.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); ItemList.Reactor_Coolant_Sp_6.set( GregTech_API.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000)); - ItemList.GlowstoneCell.set(new GT_BreederCell_Item( - "glowstoneCell", - "Glowstone Fuel Rod", - "Source of sunnarium", - 3000, - 1, - 10000, - () -> ItemList.SunnariumCell.get(1))); + ItemList.GlowstoneCell.set( + new GT_BreederCell_Item( + "glowstoneCell", + "Glowstone Fuel Rod", + "Source of sunnarium", + 3000, + 1, + 10000, + () -> ItemList.SunnariumCell.get(1))); ItemList.SunnariumCell.set(new GT_DepletetCell_Item("sunnariumCell", "Sunnarium Fuel Rod", 1)); if (!GregTech_API.mIC2Classic) { - ItemList.neutroniumHeatCapacitor.set(GregTech_API.constructCoolantCellItem( - "neutroniumHeatCapacitor", "1G Neutronium Heat Capacitor", 1000000000)); - - ItemList.Depleted_Thorium_1.set( - new GT_DepletetCell_Item("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1)); - ItemList.Depleted_Thorium_2.set(new GT_DepletetCell_Item( - "Double_ThoriumcellDep", "Dual Fuel Rod (Depleted Thorium)", 1)); // TODO CHECK num - ItemList.Depleted_Thorium_4.set(new GT_DepletetCell_Item( - "Quad_ThoriumcellDep", "Quad Fuel Rod (Depleted Thorium)", 1)); // TODO CHECK num - ItemList.ThoriumCell_1.set(new GT_RadioactiveCellIC_Item( - "Thoriumcell", - "Fuel Rod (Thorium)", - 1, - 50000, - 0.4F, - 0, - 0.25F, - ItemList.Depleted_Thorium_1.get(1), - false)); - ItemList.ThoriumCell_2.set(new GT_RadioactiveCellIC_Item( - "Double_Thoriumcell", - "Dual Fuel Rod (Thorium)", - 2, - 50000, - 0.4F, - 0, - 0.25F, - ItemList.Depleted_Thorium_2.get(1), - false)); - ItemList.ThoriumCell_4.set(new GT_RadioactiveCellIC_Item( - "Quad_Thoriumcell", - "Quad Fuel Rod (Thorium)", - 4, - 50000, - 0.4F, - 0, - 0.25F, - ItemList.Depleted_Thorium_4.get(1), - false)); + ItemList.neutroniumHeatCapacitor.set( + GregTech_API.constructCoolantCellItem( + "neutroniumHeatCapacitor", + "1G Neutronium Heat Capacitor", + 1000000000)); + + ItemList.Depleted_Thorium_1 + .set(new GT_DepletetCell_Item("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1)); + ItemList.Depleted_Thorium_2 + .set(new GT_DepletetCell_Item("Double_ThoriumcellDep", "Dual Fuel Rod (Depleted Thorium)", 1)); // TODO + // CHECK + // num + ItemList.Depleted_Thorium_4 + .set(new GT_DepletetCell_Item("Quad_ThoriumcellDep", "Quad Fuel Rod (Depleted Thorium)", 1)); // TODO + // CHECK + // num + ItemList.ThoriumCell_1.set( + new GT_RadioactiveCellIC_Item( + "Thoriumcell", + "Fuel Rod (Thorium)", + 1, + 50000, + 0.4F, + 0, + 0.25F, + ItemList.Depleted_Thorium_1.get(1), + false)); + ItemList.ThoriumCell_2.set( + new GT_RadioactiveCellIC_Item( + "Double_Thoriumcell", + "Dual Fuel Rod (Thorium)", + 2, + 50000, + 0.4F, + 0, + 0.25F, + ItemList.Depleted_Thorium_2.get(1), + false)); + ItemList.ThoriumCell_4.set( + new GT_RadioactiveCellIC_Item( + "Quad_Thoriumcell", + "Quad Fuel Rod (Thorium)", + 4, + 50000, + 0.4F, + 0, + 0.25F, + ItemList.Depleted_Thorium_4.get(1), + false)); GT_ModHandler.addThermalCentrifugeRecipe( ItemList.Depleted_Thorium_1.get(1), @@ -235,42 +253,45 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L)); - ItemList.Depleted_Naquadah_1.set( - new GT_DepletetCell_Item("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1)); - ItemList.Depleted_Naquadah_2.set( - new GT_DepletetCell_Item("Double_NaquadahcellDep", "Dual Fuel Rod (Depleted Naquadah)", 1)); - ItemList.Depleted_Naquadah_4.set( - new GT_DepletetCell_Item("Quad_NaquadahcellDep", "Quad Fuel Rod (Depleted Naquadah)", 1)); - ItemList.NaquadahCell_1.set(new GT_RadioactiveCellIC_Item( - "Naquadahcell", - "Fuel Rod (Naquadah)", - 1, - 100000, - 4F, - 1, - 1F, - ItemList.Depleted_Naquadah_1.get(1), - false)); - ItemList.NaquadahCell_2.set(new GT_RadioactiveCellIC_Item( - "Double_Naquadahcell", - "Dual Fuel Rod (Naquadah)", - 2, - 100000, - 4F, - 1, - 1F, - ItemList.Depleted_Naquadah_2.get(1), - false)); - ItemList.NaquadahCell_4.set(new GT_RadioactiveCellIC_Item( - "Quad_Naquadahcell", - "Quad Fuel Rod (Naquadah)", - 4, - 100000, - 4F, - 1, - 1F, - ItemList.Depleted_Naquadah_4.get(1), - false)); + ItemList.Depleted_Naquadah_1 + .set(new GT_DepletetCell_Item("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1)); + ItemList.Depleted_Naquadah_2 + .set(new GT_DepletetCell_Item("Double_NaquadahcellDep", "Dual Fuel Rod (Depleted Naquadah)", 1)); + ItemList.Depleted_Naquadah_4 + .set(new GT_DepletetCell_Item("Quad_NaquadahcellDep", "Quad Fuel Rod (Depleted Naquadah)", 1)); + ItemList.NaquadahCell_1.set( + new GT_RadioactiveCellIC_Item( + "Naquadahcell", + "Fuel Rod (Naquadah)", + 1, + 100000, + 4F, + 1, + 1F, + ItemList.Depleted_Naquadah_1.get(1), + false)); + ItemList.NaquadahCell_2.set( + new GT_RadioactiveCellIC_Item( + "Double_Naquadahcell", + "Dual Fuel Rod (Naquadah)", + 2, + 100000, + 4F, + 1, + 1F, + ItemList.Depleted_Naquadah_2.get(1), + false)); + ItemList.NaquadahCell_4.set( + new GT_RadioactiveCellIC_Item( + "Quad_Naquadahcell", + "Quad Fuel Rod (Naquadah)", + 4, + 100000, + 4F, + 1, + 1F, + ItemList.Depleted_Naquadah_4.get(1), + false)); GT_Values.RA.addCentrifugeRecipe( ItemList.Depleted_Naquadah_1.get(1), @@ -283,7 +304,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L), - new int[] {10_000, 5_000, 5_000, 2_500, 10_000, 10_000}, + new int[] { 10_000, 5_000, 5_000, 2_500, 10_000, 10_000 }, 500, 2000); GT_Values.RA.addCentrifugeRecipe( @@ -297,7 +318,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 18L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L), - new int[] {10_000, 5_000, 5_000, 2_500, 10_000, 10_000}, + new int[] { 10_000, 5_000, 5_000, 2_500, 10_000, 10_000 }, 1000, 2000); GT_Values.RA.addCentrifugeRecipe( @@ -311,44 +332,47 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 8L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 38L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L), - new int[] {10_000, 5_000, 5_000, 2_500, 10_000, 10_000}, + new int[] { 10_000, 5_000, 5_000, 2_500, 10_000, 10_000 }, 2000, 2000); ItemList.Depleted_MNq_1.set(new GT_DepletetCell_Item("MNqCellDep", "Fuel Rod (Depleted Nq*)", 1)); - ItemList.Depleted_MNq_2.set( - new GT_DepletetCell_Item("Double_MNqCellDep", "Dual Fuel Rod (Depleted Nq*)", 1)); + ItemList.Depleted_MNq_2 + .set(new GT_DepletetCell_Item("Double_MNqCellDep", "Dual Fuel Rod (Depleted Nq*)", 1)); ItemList.Depleted_MNq_4.set(new GT_DepletetCell_Item("Quad_MNqCellDep", "Quad Fuel Rod (Depleted Nq*)", 1)); - ItemList.MNqCell_1.set(new GT_RadioactiveCellIC_Item( - "MNqCell", - "Fuel Rod (Nq* - MOX like behaviour)", - 1, - 100000, - 4F, - 1, - 1F, - ItemList.Depleted_MNq_1.get(1), - true)); - ItemList.MNqCell_2.set(new GT_RadioactiveCellIC_Item( - "Double_MNqCell", - "Dual Fuel Rod (Nq* - MOX like behaviour)", - 2, - 100000, - 4F, - 1, - 1F, - ItemList.Depleted_MNq_2.get(1), - true)); - ItemList.MNqCell_4.set(new GT_RadioactiveCellIC_Item( - "Quad_MNqCell", - "Quad Fuel Rod (Nq* - MOX like behaviour)", - 4, - 100000, - 4F, - 1, - 1F, - ItemList.Depleted_MNq_4.get(1), - true)); + ItemList.MNqCell_1.set( + new GT_RadioactiveCellIC_Item( + "MNqCell", + "Fuel Rod (Nq* - MOX like behaviour)", + 1, + 100000, + 4F, + 1, + 1F, + ItemList.Depleted_MNq_1.get(1), + true)); + ItemList.MNqCell_2.set( + new GT_RadioactiveCellIC_Item( + "Double_MNqCell", + "Dual Fuel Rod (Nq* - MOX like behaviour)", + 2, + 100000, + 4F, + 1, + 1F, + ItemList.Depleted_MNq_2.get(1), + true)); + ItemList.MNqCell_4.set( + new GT_RadioactiveCellIC_Item( + "Quad_MNqCell", + "Quad Fuel Rod (Nq* - MOX like behaviour)", + 4, + 100000, + 4F, + 1, + 1F, + ItemList.Depleted_MNq_4.get(1), + true)); GT_Values.RA.addCentrifugeRecipe( ItemList.Depleted_MNq_1.get(1), @@ -361,7 +385,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L), - new int[] {10_000, 5_000, 5_000, 2_500, 10_000, 10_000}, + new int[] { 10_000, 5_000, 5_000, 2_500, 10_000, 10_000 }, 500, 2000); GT_Values.RA.addCentrifugeRecipe( @@ -375,7 +399,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 18L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L), - new int[] {10_000, 5_000, 5_000, 2_500, 10_000, 10_000}, + new int[] { 10_000, 5_000, 5_000, 2_500, 10_000, 10_000 }, 1000, 2000); GT_Values.RA.addCentrifugeRecipe( @@ -389,70 +413,76 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 8L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 38L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L), - new int[] {10_000, 5_000, 5_000, 2_500, 10_000, 10_000}, + new int[] { 10_000, 5_000, 5_000, 2_500, 10_000, 10_000 }, 2000, 2000); - ItemList.Uraniumcell_1.set(new GT_RadioactiveCellIC_Item( - "reactorUraniumSimple", - "Fuel Rod (Uranium)", - 1, - 20000, - 2F, - 1, - 1F, - GT_ModHandler.getIC2Item("reactorDepletedUraniumSimple", 1), - false)); - ItemList.Uraniumcell_2.set(new GT_RadioactiveCellIC_Item( - "reactorUraniumDual", - "Dual Fuel Rod (Uranium)", - 2, - 20000, - 2F, - 1, - 1F, - GT_ModHandler.getIC2Item("reactorDepletedUraniumDual", 1), - false)); - ItemList.Uraniumcell_4.set(new GT_RadioactiveCellIC_Item( - "reactorUraniumQuad", - "Quad Fuel Rod (Uranium)", - 4, - 20000, - 2F, - 1, - 1F, - GT_ModHandler.getIC2Item("reactorDepletedUraniumQuad", 1), - false)); - ItemList.Moxcell_1.set(new GT_RadioactiveCellIC_Item( - "reactorMOXSimple", - "Fuel Rod (Mox)", - 1, - 10000, - 2F, - 1, - 1F, - GT_ModHandler.getIC2Item("reactorDepletedMOXSimple", 1), - true)); - ItemList.Moxcell_2.set(new GT_RadioactiveCellIC_Item( - "reactorMOXDual", - "Dual Fuel Rod (Mox)", - 2, - 10000, - 2F, - 1, - 1F, - GT_ModHandler.getIC2Item("reactorDepletedMOXDual", 1), - true)); - ItemList.Moxcell_4.set(new GT_RadioactiveCellIC_Item( - "reactorMOXQuad", - "Quad Fuel Rod (Mox)", - 4, - 10000, - 2F, - 1, - 1F, - GT_ModHandler.getIC2Item("reactorDepletedMOXQuad", 1), - true)); + ItemList.Uraniumcell_1.set( + new GT_RadioactiveCellIC_Item( + "reactorUraniumSimple", + "Fuel Rod (Uranium)", + 1, + 20000, + 2F, + 1, + 1F, + GT_ModHandler.getIC2Item("reactorDepletedUraniumSimple", 1), + false)); + ItemList.Uraniumcell_2.set( + new GT_RadioactiveCellIC_Item( + "reactorUraniumDual", + "Dual Fuel Rod (Uranium)", + 2, + 20000, + 2F, + 1, + 1F, + GT_ModHandler.getIC2Item("reactorDepletedUraniumDual", 1), + false)); + ItemList.Uraniumcell_4.set( + new GT_RadioactiveCellIC_Item( + "reactorUraniumQuad", + "Quad Fuel Rod (Uranium)", + 4, + 20000, + 2F, + 1, + 1F, + GT_ModHandler.getIC2Item("reactorDepletedUraniumQuad", 1), + false)); + ItemList.Moxcell_1.set( + new GT_RadioactiveCellIC_Item( + "reactorMOXSimple", + "Fuel Rod (Mox)", + 1, + 10000, + 2F, + 1, + 1F, + GT_ModHandler.getIC2Item("reactorDepletedMOXSimple", 1), + true)); + ItemList.Moxcell_2.set( + new GT_RadioactiveCellIC_Item( + "reactorMOXDual", + "Dual Fuel Rod (Mox)", + 2, + 10000, + 2F, + 1, + 1F, + GT_ModHandler.getIC2Item("reactorDepletedMOXDual", 1), + true)); + ItemList.Moxcell_4.set( + new GT_RadioactiveCellIC_Item( + "reactorMOXQuad", + "Quad Fuel Rod (Mox)", + 4, + 10000, + 2F, + 1, + 1F, + GT_ModHandler.getIC2Item("reactorDepletedMOXQuad", 1), + true)); } GT_Log.out.println("GT_Mod: Adding Blocks."); @@ -475,259 +505,108 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GregTech_API.sBlockMetal1 = new GT_Block_Metal( "gt.blockmetal1", - new Materials[] { - Materials.Adamantium, - Materials.Aluminium, - Materials.Americium, - Materials.AnnealedCopper, - Materials.Antimony, - Materials.Arsenic, - Materials.AstralSilver, - Materials.BatteryAlloy, - Materials.Beryllium, - Materials.Bismuth, - Materials.BismuthBronze, - Materials.BlackBronze, - Materials.BlackSteel, - Materials.BlueAlloy, - Materials.BlueSteel, - Materials.Brass - }, + new Materials[] { Materials.Adamantium, Materials.Aluminium, Materials.Americium, + Materials.AnnealedCopper, Materials.Antimony, Materials.Arsenic, Materials.AstralSilver, + Materials.BatteryAlloy, Materials.Beryllium, Materials.Bismuth, Materials.BismuthBronze, + Materials.BlackBronze, Materials.BlackSteel, Materials.BlueAlloy, Materials.BlueSteel, + Materials.Brass }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS1); GregTech_API.sBlockMetal2 = new GT_Block_Metal( "gt.blockmetal2", - new Materials[] { - Materials.Bronze, - Materials.Caesium, - Materials.Cerium, - Materials.Chrome, - Materials.ChromiumDioxide, - Materials.Cobalt, - Materials.CobaltBrass, - Materials.Copper, - Materials.Cupronickel, - Materials.DamascusSteel, - Materials.DarkIron, - Materials.DeepIron, - Materials.Desh, - Materials.Duranium, - Materials.Dysprosium, - Materials.Electrum - }, + new Materials[] { Materials.Bronze, Materials.Caesium, Materials.Cerium, Materials.Chrome, + Materials.ChromiumDioxide, Materials.Cobalt, Materials.CobaltBrass, Materials.Copper, + Materials.Cupronickel, Materials.DamascusSteel, Materials.DarkIron, Materials.DeepIron, + Materials.Desh, Materials.Duranium, Materials.Dysprosium, Materials.Electrum }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS2); GregTech_API.sBlockMetal3 = new GT_Block_Metal( "gt.blockmetal3", - new Materials[] { - Materials.ElectrumFlux, - Materials.Enderium, - Materials.Erbium, - Materials.Europium, - Materials.FierySteel, - Materials.Gadolinium, - Materials.Gallium, - Materials.Holmium, - Materials.HSLA, - Materials.Indium, - Materials.InfusedGold, - Materials.Invar, - Materials.Iridium, - Materials.IronMagnetic, - Materials.IronWood, - Materials.Kanthal - }, + new Materials[] { Materials.ElectrumFlux, Materials.Enderium, Materials.Erbium, Materials.Europium, + Materials.FierySteel, Materials.Gadolinium, Materials.Gallium, Materials.Holmium, + Materials.HSLA, Materials.Indium, Materials.InfusedGold, Materials.Invar, Materials.Iridium, + Materials.IronMagnetic, Materials.IronWood, Materials.Kanthal }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS3); GregTech_API.sBlockMetal4 = new GT_Block_Metal( "gt.blockmetal4", - new Materials[] { - Materials.Knightmetal, - Materials.Lanthanum, - Materials.Lead, - Materials.Lutetium, - Materials.Magnalium, - Materials.Magnesium, - Materials.Manganese, - Materials.MeteoricIron, - Materials.MeteoricSteel, - Materials.Trinium, - Materials.Mithril, - Materials.Molybdenum, - Materials.Naquadah, - Materials.NaquadahAlloy, - Materials.NaquadahEnriched, - Materials.Naquadria - }, + new Materials[] { Materials.Knightmetal, Materials.Lanthanum, Materials.Lead, Materials.Lutetium, + Materials.Magnalium, Materials.Magnesium, Materials.Manganese, Materials.MeteoricIron, + Materials.MeteoricSteel, Materials.Trinium, Materials.Mithril, Materials.Molybdenum, + Materials.Naquadah, Materials.NaquadahAlloy, Materials.NaquadahEnriched, Materials.Naquadria }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS4); GregTech_API.sBlockMetal5 = new GT_Block_Metal( "gt.blockmetal5", - new Materials[] { - Materials.Neodymium, - Materials.NeodymiumMagnetic, - Materials.Neutronium, - Materials.Nichrome, - Materials.Nickel, - Materials.Niobium, - Materials.NiobiumNitride, - Materials.NiobiumTitanium, - Materials.Osmiridium, - Materials.Osmium, - Materials.Palladium, - Materials.PigIron, - Materials.Platinum, - Materials.Plutonium, - Materials.Plutonium241, - Materials.Praseodymium - }, + new Materials[] { Materials.Neodymium, Materials.NeodymiumMagnetic, Materials.Neutronium, + Materials.Nichrome, Materials.Nickel, Materials.Niobium, Materials.NiobiumNitride, + Materials.NiobiumTitanium, Materials.Osmiridium, Materials.Osmium, Materials.Palladium, + Materials.PigIron, Materials.Platinum, Materials.Plutonium, Materials.Plutonium241, + Materials.Praseodymium }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS5); GregTech_API.sBlockMetal6 = new GT_Block_Metal( "gt.blockmetal6", - new Materials[] { - Materials.Promethium, - Materials.RedAlloy, - Materials.RedSteel, - Materials.RoseGold, - Materials.Rubidium, - Materials.Samarium, - Materials.Scandium, - Materials.ShadowIron, - Materials.ShadowSteel, - Materials.Silicon, - Materials.Silver, - Materials.SolderingAlloy, - Materials.StainlessSteel, - Materials.Steel, - Materials.SteelMagnetic, - Materials.SterlingSilver - }, + new Materials[] { Materials.Promethium, Materials.RedAlloy, Materials.RedSteel, Materials.RoseGold, + Materials.Rubidium, Materials.Samarium, Materials.Scandium, Materials.ShadowIron, + Materials.ShadowSteel, Materials.Silicon, Materials.Silver, Materials.SolderingAlloy, + Materials.StainlessSteel, Materials.Steel, Materials.SteelMagnetic, Materials.SterlingSilver }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS6); GregTech_API.sBlockMetal7 = new GT_Block_Metal( "gt.blockmetal7", - new Materials[] { - Materials.Sunnarium, - Materials.Tantalum, - Materials.Tellurium, - Materials.Terbium, - Materials.Thaumium, - Materials.Thorium, - Materials.Thulium, - Materials.Tin, - Materials.TinAlloy, - Materials.Titanium, - Materials.Tritanium, - Materials.Tungsten, - Materials.TungstenSteel, - Materials.Ultimet, - Materials.Uranium, - Materials.Uranium235 - }, + new Materials[] { Materials.Sunnarium, Materials.Tantalum, Materials.Tellurium, Materials.Terbium, + Materials.Thaumium, Materials.Thorium, Materials.Thulium, Materials.Tin, Materials.TinAlloy, + Materials.Titanium, Materials.Tritanium, Materials.Tungsten, Materials.TungstenSteel, + Materials.Ultimet, Materials.Uranium, Materials.Uranium235 }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS7); GregTech_API.sBlockMetal8 = new GT_Block_Metal( "gt.blockmetal8", - new Materials[] { - Materials.Vanadium, - Materials.VanadiumGallium, - Materials.WroughtIron, - Materials.Ytterbium, - Materials.Yttrium, - Materials.YttriumBariumCuprate, - Materials.Zinc, - Materials.TungstenCarbide, - Materials.VanadiumSteel, - Materials.HSSG, - Materials.HSSE, - Materials.HSSS, - Materials.Steeleaf, - Materials.Ichorium, - Materials.Firestone, - Materials.Shadow - }, + new Materials[] { Materials.Vanadium, Materials.VanadiumGallium, Materials.WroughtIron, + Materials.Ytterbium, Materials.Yttrium, Materials.YttriumBariumCuprate, Materials.Zinc, + Materials.TungstenCarbide, Materials.VanadiumSteel, Materials.HSSG, Materials.HSSE, + Materials.HSSS, Materials.Steeleaf, Materials.Ichorium, Materials.Firestone, Materials.Shadow }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS8); GregTech_API.sBlockGem1 = new GT_Block_Metal( "gt.blockgem1", - new Materials[] { - Materials.InfusedAir, - Materials.Amber, - Materials.Amethyst, - Materials.InfusedWater, - Materials.BlueTopaz, - Materials.CertusQuartz, - Materials.Dilithium, - Materials.EnderEye, - Materials.EnderPearl, - Materials.FoolsRuby, - Materials.Force, - Materials.Forcicium, - Materials.Forcillium, - Materials.GreenSapphire, - Materials.InfusedFire, - Materials.Jasper - }, + new Materials[] { Materials.InfusedAir, Materials.Amber, Materials.Amethyst, Materials.InfusedWater, + Materials.BlueTopaz, Materials.CertusQuartz, Materials.Dilithium, Materials.EnderEye, + Materials.EnderPearl, Materials.FoolsRuby, Materials.Force, Materials.Forcicium, + Materials.Forcillium, Materials.GreenSapphire, Materials.InfusedFire, Materials.Jasper }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS9); GregTech_API.sBlockGem2 = new GT_Block_Metal( "gt.blockgem2", - new Materials[] { - Materials.Lazurite, - Materials.Lignite, - Materials.Monazite, - Materials.Niter, - Materials.Olivine, - Materials.Opal, - Materials.InfusedOrder, - Materials.InfusedEntropy, - Materials.TricalciumPhosphate, - Materials.Quartzite, - Materials.GarnetRed, - Materials.Ruby, - Materials.Sapphire, - Materials.Sodalite, - Materials.Tanzanite, - Materials.InfusedEarth - }, + new Materials[] { Materials.Lazurite, Materials.Lignite, Materials.Monazite, Materials.Niter, + Materials.Olivine, Materials.Opal, Materials.InfusedOrder, Materials.InfusedEntropy, + Materials.TricalciumPhosphate, Materials.Quartzite, Materials.GarnetRed, Materials.Ruby, + Materials.Sapphire, Materials.Sodalite, Materials.Tanzanite, Materials.InfusedEarth }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS10); GregTech_API.sBlockGem3 = new GT_Block_Metal( "gt.blockgem3", - new Materials[] { - Materials.Topaz, - Materials.Vinteum, - Materials.GarnetYellow, - Materials.NetherStar, - Materials.Charcoal, - Materials.Blaze - }, + new Materials[] { Materials.Topaz, Materials.Vinteum, Materials.GarnetYellow, Materials.NetherStar, + Materials.Charcoal, Materials.Blaze }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS11); GregTech_API.sBlockMetal9 = new GT_Block_Metal( "gt.blockmetal9", - new Materials[] { - Materials.Cryolite, - Materials.SiliconSG, - MaterialsKevlar.NickelAluminide, - Materials.SpaceTime, - Materials.TranscendentMetal, - Materials.Oriharukon, - Materials.WhiteDwarfMatter, - Materials.BlackDwarfMatter - }, + new Materials[] { Materials.Cryolite, Materials.SiliconSG, MaterialsKevlar.NickelAluminide, + Materials.SpaceTime, Materials.TranscendentMetal, Materials.Oriharukon, + Materials.WhiteDwarfMatter, Materials.BlackDwarfMatter }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12); @@ -744,10 +623,8 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { } GT_Log.out.println("GT_Mod: Registering the BaseMetaTileEntity."); GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity"); - FMLInterModComms.sendMessage( - "appliedenergistics2", - "whitelist-spatial", - tBaseMetaTileEntity.getClass().getName()); + FMLInterModComms + .sendMessage("appliedenergistics2", "whitelist-spatial", tBaseMetaTileEntity.getClass().getName()); GT_Log.out.println("GT_Mod: Registering the BaseMetaPipeEntity."); GameRegistry.registerTileEntity(BaseMetaPipeEntity.class, "BaseMetaPipeEntity"); @@ -758,147 +635,83 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", GT_TileEntity_Ores.class.getName()); if (!GregTech_API.mIC2Classic) { GT_Log.out.println("GT_Mod: Registering Fluids."); - Materials.ConstructionFoam.mFluid = GT_Utility.getFluidForFilledItem( - GT_ModHandler.getIC2Item("CFCell", 1L), true) - .getFluid(); - Materials.UUMatter.mFluid = GT_Utility.getFluidForFilledItem( - GT_ModHandler.getIC2Item("uuMatterCell", 1L), true) - .getFluid(); + Materials.ConstructionFoam.mFluid = GT_Utility + .getFluidForFilledItem(GT_ModHandler.getIC2Item("CFCell", 1L), true).getFluid(); + Materials.UUMatter.mFluid = GT_Utility + .getFluidForFilledItem(GT_ModHandler.getIC2Item("uuMatterCell", 1L), true).getFluid(); } - GT_FluidFactory.builder("Air") - .withLocalizedName("Air") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() + GT_FluidFactory.builder("Air").withLocalizedName("Air").withStateAndTemperature(GAS, 295).buildAndRegister() .configureMaterials(Materials.Air) .registerContainers(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L), 2000); - GT_FluidFactory.builder("LiquidOxygen") - .withLocalizedName("Liquid Oxygen") - .withStateAndTemperature(GAS, 60) - .buildAndRegister() - .configureMaterials(Materials.LiquidOxygen) - .registerBContainers( + GT_FluidFactory.builder("LiquidOxygen").withLocalizedName("Liquid Oxygen").withStateAndTemperature(GAS, 60) + .buildAndRegister().configureMaterials(Materials.LiquidOxygen).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("LiquidNitrogen") - .withLocalizedName("Liquid Nitrogen") - .withStateAndTemperature(GAS, 77) - .buildAndRegister() - .configureMaterials(Materials.LiquidNitrogen) - .registerBContainers( + GT_FluidFactory.builder("LiquidNitrogen").withLocalizedName("Liquid Nitrogen").withStateAndTemperature(GAS, 77) + .buildAndRegister().configureMaterials(Materials.LiquidNitrogen).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("LiquidAir") - .withLocalizedName("Liquid Air") - .withStateAndTemperature(LIQUID, 77) - .buildAndRegister() - .configureMaterials(Materials.LiquidAir) - .registerBContainers( + GT_FluidFactory.builder("LiquidAir").withLocalizedName("Liquid Air").withStateAndTemperature(LIQUID, 77) + .buildAndRegister().configureMaterials(Materials.LiquidAir).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Oxygen") - .withLocalizedName("Oxygen") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Oxygen) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Hydrogen") - .withLocalizedName("Hydrogen") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Hydrogen) - .registerBContainers( + GT_FluidFactory.builder("Oxygen").withLocalizedName("Oxygen").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.Oxygen).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Hydrogen").withLocalizedName("Hydrogen").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.Hydrogen).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Deuterium") - .withLocalizedName("Deuterium") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Deuterium) - .registerBContainers( + GT_FluidFactory.builder("Deuterium").withLocalizedName("Deuterium").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.Deuterium).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Tritium") - .withLocalizedName("Tritium") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Tritium) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Helium") - .withLocalizedName("Helium") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Helium) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Argon") - .withLocalizedName("Argon") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Argon) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Radon") - .withLocalizedName("Radon") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Radon) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Tritium").withLocalizedName("Tritium").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.Tritium).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Helium").withLocalizedName("Helium").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.Helium).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Argon").withLocalizedName("Argon").withStateAndTemperature(GAS, 295).buildAndRegister() + .configureMaterials(Materials.Argon).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Radon").withLocalizedName("Radon").withStateAndTemperature(GAS, 295).buildAndRegister() + .configureMaterials(Materials.Radon).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), + ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Fluorine") - .withLocalizedName("Fluorine") - .withStateAndTemperature(GAS, 53) - .buildAndRegister() - .configureMaterials(Materials.Fluorine) - .registerBContainers( + GT_FluidFactory.builder("Fluorine").withLocalizedName("Fluorine").withStateAndTemperature(GAS, 53) + .buildAndRegister().configureMaterials(Materials.Fluorine).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Titaniumtetrachloride") - .withLocalizedName("Titaniumtetrachloride") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Titaniumtetrachloride) - .registerBContainers( + GT_FluidFactory.builder("Titaniumtetrachloride").withLocalizedName("Titaniumtetrachloride") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() + .configureMaterials(Materials.Titaniumtetrachloride).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Helium-3") - .withLocalizedName("Helium-3") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Helium_3) - .registerBContainers( + GT_FluidFactory.builder("Helium-3").withLocalizedName("Helium-3").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.Helium_3).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium_3, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Methane") - .withLocalizedName("Methane") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Methane) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Nitrogen") - .withLocalizedName("Nitrogen") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Nitrogen) - .registerBContainers( + GT_FluidFactory.builder("Methane").withLocalizedName("Methane").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.Methane).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Nitrogen").withLocalizedName("Nitrogen").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.Nitrogen).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("NitrogenDioxide") - .withLocalizedName("Nitrogen Dioxide") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.NitrogenDioxide) + GT_FluidFactory.builder("NitrogenDioxide").withLocalizedName("Nitrogen Dioxide") + .withStateAndTemperature(GAS, 295).buildAndRegister().configureMaterials(Materials.NitrogenDioxide) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrogenDioxide, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Steam") - .withLocalizedName("Steam") - .withStateAndTemperature(GAS, 375) - .buildAndRegister() + GT_FluidFactory.builder("Steam").withLocalizedName("Steam").withStateAndTemperature(GAS, 375).buildAndRegister() .configureMaterials(Materials.Water) .registerBContainers(GT_ModHandler.getIC2Item("steamCell", 1), Materials.Empty.getCells(1)); GT_Values.RA.addFluidCannerRecipe( @@ -910,429 +723,277 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { Materials.Water.mGas.setTemperature(375).setGaseous(true); ItemList.sOilExtraHeavy = GT_FluidFactory.of("liquid_extra_heavy_oil", "Very Heavy Oil", LIQUID, 295); - ItemList.sEpichlorhydrin = GT_FluidFactory.builder("liquid_epichlorhydrin") - .withLocalizedName("Epichlorohydrin") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Epichlorohydrin) - .registerBContainers(Materials.Epichlorohydrin.getCells(1), Materials.Empty.getCells(1)) - .asFluid(); + ItemList.sEpichlorhydrin = GT_FluidFactory.builder("liquid_epichlorhydrin").withLocalizedName("Epichlorohydrin") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.Epichlorohydrin) + .registerBContainers(Materials.Epichlorohydrin.getCells(1), Materials.Empty.getCells(1)).asFluid(); ItemList.sDrillingFluid = GT_FluidFactory.of("liquid_drillingfluid", "Drilling Fluid", LIQUID, 295); - ItemList.sToluene = GT_FluidFactory.builder("liquid_toluene") - .withLocalizedName("Toluene") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Toluene) - .registerBContainers(Materials.Toluene.getCells(1), Materials.Empty.getCells(1)) - .asFluid(); + ItemList.sToluene = GT_FluidFactory.builder("liquid_toluene").withLocalizedName("Toluene") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.Toluene) + .registerBContainers(Materials.Toluene.getCells(1), Materials.Empty.getCells(1)).asFluid(); ItemList.sNitrationMixture = GT_FluidFactory.builder("liquid_nitrationmixture") - .withLocalizedName("Nitration Mixture") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + .withLocalizedName("Nitration Mixture").withStateAndTemperature(LIQUID, 295).buildAndRegister() .configureMaterials(Materials.NitrationMixture) - .registerBContainers(Materials.NitrationMixture.getCells(1), Materials.Empty.getCells(1)) - .asFluid(); + .registerBContainers(Materials.NitrationMixture.getCells(1), Materials.Empty.getCells(1)).asFluid(); - GT_FluidFactory.builder("liquid_heavy_oil") - .withLocalizedName("Heavy Oil") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.OilHeavy) - .registerBContainers( + GT_FluidFactory.builder("liquid_heavy_oil").withLocalizedName("Heavy Oil").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.OilHeavy).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilHeavy, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_medium_oil") - .withLocalizedName("Raw Oil") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.OilMedium) - .registerBContainers( + GT_FluidFactory.builder("liquid_medium_oil").withLocalizedName("Raw Oil").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.OilMedium).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilMedium, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_light_oil") - .withLocalizedName("Light Oil") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.OilLight) - .registerBContainers( + GT_FluidFactory.builder("liquid_light_oil").withLocalizedName("Light Oil").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.OilLight).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilLight, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("gas_natural_gas") - .withLocalizedName("Natural Gas") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.NatruralGas) - .registerBContainers( + GT_FluidFactory.builder("gas_natural_gas").withLocalizedName("Natural Gas").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.NatruralGas).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 1L), ItemList.Cell_Empty.get(1L)); - ItemList.sHydricSulfur = GT_FluidFactory.builder("liquid_hydricsulfur") - .withLocalizedName("Hydrogen Sulfide") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.HydricSulfide) + ItemList.sHydricSulfur = GT_FluidFactory.builder("liquid_hydricsulfur").withLocalizedName("Hydrogen Sulfide") + .withStateAndTemperature(GAS, 295).buildAndRegister().configureMaterials(Materials.HydricSulfide) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), ItemList.Cell_Empty.get(1L)) .asFluid(); - GT_FluidFactory.builder("gas_sulfuricgas") - .withLocalizedName("Sulfuric Gas") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.SulfuricGas) - .registerBContainers( + GT_FluidFactory.builder("gas_sulfuricgas").withLocalizedName("Sulfuric Gas").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.SulfuricGas).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("gas_gas") - .withLocalizedName("Refinery Gas") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Gas) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_sulfuricnaphtha") - .withLocalizedName("Sulfuric Naphtha") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.SulfuricNaphtha) + GT_FluidFactory.builder("gas_gas").withLocalizedName("Refinery Gas").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.Gas).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_sulfuricnaphtha").withLocalizedName("Sulfuric Naphtha") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.SulfuricNaphtha) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_sufluriclight_fuel") - .withLocalizedName("Sulfuric Light Fuel") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.SulfuricLightFuel) + GT_FluidFactory.builder("liquid_sufluriclight_fuel").withLocalizedName("Sulfuric Light Fuel") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.SulfuricLightFuel) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_sulfuricheavy_fuel") - .withLocalizedName("Sulfuric Heavy Fuel") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.SulfuricHeavyFuel) + GT_FluidFactory.builder("liquid_sulfuricheavy_fuel").withLocalizedName("Sulfuric Heavy Fuel") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.SulfuricHeavyFuel) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_naphtha") - .withLocalizedName("Naphtha") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Naphtha) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_light_fuel") - .withLocalizedName("Light Fuel") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.LightFuel) + GT_FluidFactory.builder("liquid_naphtha").withLocalizedName("Naphtha").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.Naphtha).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_light_fuel").withLocalizedName("Light Fuel") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.LightFuel) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_heavy_fuel") - .withLocalizedName("Heavy Fuel") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.HeavyFuel) + GT_FluidFactory.builder("liquid_heavy_fuel").withLocalizedName("Heavy Fuel") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.HeavyFuel) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_lpg") - .withLocalizedName("LPG") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.LPG) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LPG, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("charcoal_byproducts") - .withTextureName("molten.autogenerated") - .withLocalizedName("Charcoal Byproducts") - .withColorRGBA(Materials.CharcoalByproducts.mRGBa) - .withStateAndTemperature(GAS, 775) - .buildAndRegister() - .configureMaterials(Materials.CharcoalByproducts) + GT_FluidFactory.builder("liquid_lpg").withLocalizedName("LPG").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.LPG).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LPG, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("charcoal_byproducts").withTextureName("molten.autogenerated") + .withLocalizedName("Charcoal Byproducts").withColorRGBA(Materials.CharcoalByproducts.mRGBa) + .withStateAndTemperature(GAS, 775).buildAndRegister().configureMaterials(Materials.CharcoalByproducts) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CharcoalByproducts, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("molten.bisphenol_a") - .withTextureName("molten.autogenerated") - .withLocalizedName("Molten Bisphenol A") - .withColorRGBA(Materials.BisphenolA.mRGBa) - .withStateAndTemperature(LIQUID, 432) - .buildAndRegister() - .configureMaterials(Materials.BisphenolA) + GT_FluidFactory.builder("molten.bisphenol_a").withTextureName("molten.autogenerated") + .withLocalizedName("Molten Bisphenol A").withColorRGBA(Materials.BisphenolA.mRGBa) + .withStateAndTemperature(LIQUID, 432).buildAndRegister().configureMaterials(Materials.BisphenolA) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.BisphenolA, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("UUAmplifier") - .withLocalizedName("UU Amplifier") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.UUAmplifier) - .registerBContainers( + GT_FluidFactory.builder("UUAmplifier").withLocalizedName("UU Amplifier").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.UUAmplifier).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.UUAmplifier, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Chlorine") - .withLocalizedName("Chlorine") - .withStateAndTemperature(GAS, 295) - .buildAndRegister() - .configureMaterials(Materials.Chlorine) - .registerBContainers( + GT_FluidFactory.builder("Chlorine").withLocalizedName("Chlorine").withStateAndTemperature(GAS, 295) + .buildAndRegister().configureMaterials(Materials.Chlorine).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Mercury") - .withLocalizedName("Mercury") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Mercury) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Mercury, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("NitroFuel") - .withLocalizedName("Cetane-Boosted Diesel") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.NitroFuel) + GT_FluidFactory.builder("Mercury").withLocalizedName("Mercury").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.Mercury).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Mercury, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("NitroFuel").withLocalizedName("Cetane-Boosted Diesel") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.NitroFuel) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitroFuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("SodiumPersulfate") - .withLocalizedName("Sodium Persulfate") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.SodiumPersulfate) + GT_FluidFactory.builder("SodiumPersulfate").withLocalizedName("Sodium Persulfate") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.SodiumPersulfate) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SodiumPersulfate, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Glyceryl") - .withLocalizedName("Glyceryl Trinitrate") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Glyceryl) + GT_FluidFactory.builder("Glyceryl").withLocalizedName("Glyceryl Trinitrate") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.Glyceryl) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glyceryl, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("lubricant") - .withLocalizedName("Lubricant") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Lubricant) - .registerBContainers( + GT_FluidFactory.builder("lubricant").withLocalizedName("Lubricant").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.Lubricant).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("creosote") - .withLocalizedName("Creosote Oil") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Creosote) - .registerBContainers( + GT_FluidFactory.builder("creosote").withLocalizedName("Creosote Oil").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.Creosote).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("seedoil") - .withLocalizedName("Seed Oil") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.SeedOil) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("fishoil") - .withLocalizedName("Fish Oil") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.FishOil) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("oil") - .withLocalizedName("Oil") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Oil) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("fuel") - .withLocalizedName("Diesel") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Fuel) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("for.honey") - .withLocalizedName("Honey") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Honey) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("biomass") - .withLocalizedName("Biomass") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Biomass) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("bioethanol") - .withLocalizedName("Bio Ethanol") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Ethanol) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("sulfuricacid") - .withLocalizedName("Sulfuric Acid") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.SulfuricAcid) - .registerBContainers( + GT_FluidFactory.builder("seedoil").withLocalizedName("Seed Oil").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.SeedOil).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("fishoil").withLocalizedName("Fish Oil").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.FishOil).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("oil").withLocalizedName("Oil").withStateAndTemperature(LIQUID, 295).buildAndRegister() + .configureMaterials(Materials.Oil).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("fuel").withLocalizedName("Diesel").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.Fuel).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("for.honey").withLocalizedName("Honey").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.Honey).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("biomass").withLocalizedName("Biomass").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.Biomass).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("bioethanol").withLocalizedName("Bio Ethanol").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.Ethanol).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("sulfuricacid").withLocalizedName("Sulfuric Acid").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.SulfuricAcid).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("milk") - .withLocalizedName("Milk") - .withStateAndTemperature(LIQUID, 290) - .buildAndRegister() - .configureMaterials(Materials.Milk) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("mcguffium") - .withLocalizedName("Mc Guffium 239") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.McGuffium239) - .registerBContainers( + GT_FluidFactory.builder("milk").withLocalizedName("Milk").withStateAndTemperature(LIQUID, 290) + .buildAndRegister().configureMaterials(Materials.Milk).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("mcguffium").withLocalizedName("Mc Guffium 239").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.McGuffium239).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("refinedGlue") - .withLocalizedName("Refined Glue") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Glue) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("hotfryingoil") - .withLocalizedName("Hot Frying Oil") - .withStateAndTemperature(LIQUID, 400) - .buildAndRegister() - .configureMaterials(Materials.FryingOilHot) - .registerBContainers( + GT_FluidFactory.builder("refinedGlue").withLocalizedName("Refined Glue").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.Glue).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("hotfryingoil").withLocalizedName("Hot Frying Oil").withStateAndTemperature(LIQUID, 400) + .buildAndRegister().configureMaterials(Materials.FryingOilHot).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FryingOilHot, 1L), ItemList.Cell_Empty.get(1L)); GT_FluidFactory.builder("DimensionallyTranscendentResidue") - .withLocalizedName("Dimensionally Transcendent Residue") - .withStateAndTemperature(LIQUID, 2000000000) - .buildAndRegister() - .configureMaterials(Materials.DimensionallyTranscendentResidue) - .registerBContainers( + .withLocalizedName("Dimensionally Transcendent Residue").withStateAndTemperature(LIQUID, 2000000000) + .buildAndRegister().configureMaterials(Materials.DimensionallyTranscendentResidue).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.DimensionallyTranscendentResidue, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTCC") - .withLocalizedName("Excited Dimensionally Transcendent Crude Catalyst") - .withStateAndTemperature(LIQUID, 500000000) - .buildAndRegister() - .configureMaterials(Materials.ExcitedDTCC) + GT_FluidFactory.builder("ExcitedDTCC").withLocalizedName("Excited Dimensionally Transcendent Crude Catalyst") + .withStateAndTemperature(LIQUID, 500000000).buildAndRegister().configureMaterials(Materials.ExcitedDTCC) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTCC, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTPC") - .withLocalizedName("Excited Dimensionally Transcendent Prosaic Catalyst") - .withStateAndTemperature(LIQUID, 500000000) - .buildAndRegister() - .configureMaterials(Materials.ExcitedDTPC) + GT_FluidFactory.builder("ExcitedDTPC").withLocalizedName("Excited Dimensionally Transcendent Prosaic Catalyst") + .withStateAndTemperature(LIQUID, 500000000).buildAndRegister().configureMaterials(Materials.ExcitedDTPC) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTPC, 1L), ItemList.Cell_Empty.get(1L)); GT_FluidFactory.builder("ExcitedDTRC") .withLocalizedName("Excited Dimensionally Transcendent Resplendent Catalyst") - .withStateAndTemperature(LIQUID, 500000000) - .buildAndRegister() - .configureMaterials(Materials.ExcitedDTRC) + .withStateAndTemperature(LIQUID, 500000000).buildAndRegister().configureMaterials(Materials.ExcitedDTRC) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTRC, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTEC") - .withLocalizedName("Excited Dimensionally Transcendent Exotic Catalyst") - .withStateAndTemperature(LIQUID, 500000000) - .buildAndRegister() - .configureMaterials(Materials.ExcitedDTEC) + GT_FluidFactory.builder("ExcitedDTEC").withLocalizedName("Excited Dimensionally Transcendent Exotic Catalyst") + .withStateAndTemperature(LIQUID, 500000000).buildAndRegister().configureMaterials(Materials.ExcitedDTEC) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTEC, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder(Materials.RawStarMatter.mName) - .withLocalizedName(Materials.RawStarMatter.mLocalizedName) - .withStateAndTemperature(LIQUID, 10_000_000) - .buildAndRegister() - .configureMaterials(Materials.RawStarMatter) - .registerBContainers( + GT_FluidFactory.builder(Materials.RawStarMatter.mName).withLocalizedName(Materials.RawStarMatter.mLocalizedName) + .withStateAndTemperature(LIQUID, 10_000_000).buildAndRegister() + .configureMaterials(Materials.RawStarMatter).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.RawStarMatter, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder(Materials.Space.mName) - .withLocalizedName(Materials.Space.mLocalizedName) - .withStateAndTemperature(MOLTEN, 0) - .buildAndRegister() - .configureMaterials(Materials.Space) + GT_FluidFactory.builder(Materials.Space.mName).withLocalizedName(Materials.Space.mLocalizedName) + .withStateAndTemperature(MOLTEN, 0).buildAndRegister().configureMaterials(Materials.Space) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Space, 1L), ItemList.Cell_Empty.get(1L)); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Space, 1L), + ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder(Materials.Time.mName) - .withLocalizedName(Materials.Time.mLocalizedName) - .withStateAndTemperature(MOLTEN, 0) - .buildAndRegister() - .configureMaterials(Materials.Time) + GT_FluidFactory.builder(Materials.Time.mName).withLocalizedName(Materials.Time.mLocalizedName) + .withStateAndTemperature(MOLTEN, 0).buildAndRegister().configureMaterials(Materials.Time) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Time, 1L), ItemList.Cell_Empty.get(1L)); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Time, 1L), + ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("fieryblood") - .withLocalizedName("Fiery Blood") - .withStateAndTemperature(LIQUID, 6400) - .buildAndRegister() - .configureMaterials(Materials.FierySteel) - .registerBContainers( + GT_FluidFactory.builder("fieryblood").withLocalizedName("Fiery Blood").withStateAndTemperature(LIQUID, 6400) + .buildAndRegister().configureMaterials(Materials.FierySteel).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FierySteel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("holywater") - .withLocalizedName("Holy Water") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.HolyWater) - .registerBContainers( + GT_FluidFactory.builder("holywater").withLocalizedName("Holy Water").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.HolyWater).registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HolyWater, 1L), ItemList.Cell_Empty.get(1L)); if (ItemList.TF_Vial_FieryBlood.get(1L) != null) { - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - Materials.FierySteel.getFluid(250L), - ItemList.TF_Vial_FieryBlood.get(1L), - ItemList.Bottle_Empty.get(1L))); - - GT_FluidFactory.builder("liquid_sodium") - .withLocalizedName("Liquid Sodium") - .withStateAndTemperature(LIQUID, 495) - .buildAndRegister() - .configureMaterials(Materials.Sodium) + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + Materials.FierySteel.getFluid(250L), + ItemList.TF_Vial_FieryBlood.get(1L), + ItemList.Bottle_Empty.get(1L))); + + GT_FluidFactory.builder("liquid_sodium").withLocalizedName("Liquid Sodium") + .withStateAndTemperature(LIQUID, 495).buildAndRegister().configureMaterials(Materials.Sodium) .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Sodium, 1L), ItemList.Cell_Empty.get(1L)); } - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - Materials.Milk.getFluid(1000L), - GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Milk, 1L), - GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - Materials.Milk.getFluid(250L), ItemList.Bottle_Milk.get(1L), ItemList.Bottle_Empty.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - Materials.HolyWater.getFluid(250L), ItemList.Bottle_Holy_Water.get(1L), ItemList.Bottle_Empty.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - Materials.McGuffium239.getFluid(250L), ItemList.McGuffium_239.get(1L), ItemList.Bottle_Empty.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - Materials.Fuel.getFluid(100L), - ItemList.Tool_Lighter_Invar_Full.get(1L), - ItemList.Tool_Lighter_Invar_Empty.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - Materials.Fuel.getFluid(1000L), - ItemList.Tool_Lighter_Platinum_Full.get(1L), - ItemList.Tool_Lighter_Platinum_Empty.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + Materials.Milk.getFluid(1000L), + GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Milk, 1L), + GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + Materials.Milk.getFluid(250L), + ItemList.Bottle_Milk.get(1L), + ItemList.Bottle_Empty.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + Materials.HolyWater.getFluid(250L), + ItemList.Bottle_Holy_Water.get(1L), + ItemList.Bottle_Empty.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + Materials.McGuffium239.getFluid(250L), + ItemList.McGuffium_239.get(1L), + ItemList.Bottle_Empty.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + Materials.Fuel.getFluid(100L), + ItemList.Tool_Lighter_Invar_Full.get(1L), + ItemList.Tool_Lighter_Invar_Empty.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + Materials.Fuel.getFluid(1000L), + ItemList.Tool_Lighter_Platinum_Full.get(1L), + ItemList.Tool_Lighter_Platinum_Empty.get(1L))); Dyes.dyeBlack.addFluidDye((Fluid) GT_FluidFactory.of("squidink", "Squid Ink", LIQUID, 295)); Dyes.dyeBlue.addFluidDye((Fluid) GT_FluidFactory.of("indigo", "Indigo Dye", LIQUID, 295)); @@ -1341,71 +1002,46 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { Fluid tFluid; tDye.addFluidDye( GT_FluidFactory.builder("dye.watermixed." + tDye.name().toLowerCase(Locale.ENGLISH)) - .withTextureName("dyes") - .withLocalizedName("Water Mixed " + tDye.mName + " Dye") - .withColorRGBA(tDye.getRGBA()) - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + .withTextureName("dyes").withLocalizedName("Water Mixed " + tDye.mName + " Dye") + .withColorRGBA(tDye.getRGBA()).withStateAndTemperature(LIQUID, 295).buildAndRegister() .asFluid()); tDye.addFluidDye( GT_FluidFactory.builder("dye.chemical." + tDye.name().toLowerCase(Locale.ENGLISH)) - .withTextureName("dyes") - .withLocalizedName("Chemical " + tDye.mName + " Dye") - .withColorRGBA(tDye.getRGBA()) - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + .withTextureName("dyes").withLocalizedName("Chemical " + tDye.mName + " Dye") + .withColorRGBA(tDye.getRGBA()).withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerContainers(ItemList.SPRAY_CAN_DYES[i].get(1L), ItemList.Spray_Empty.get(1L), 2304) .asFluid()); } - GT_FluidFactory.builder("ice") - .withLocalizedName("Crushed Ice") - .withStateAndTemperature(SLURRY, 270) - .buildAndRegister() - .configureMaterials(Materials.Ice) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L), ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("ice").withLocalizedName("Crushed Ice").withStateAndTemperature(SLURRY, 270) + .buildAndRegister().configureMaterials(Materials.Ice).registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L), + ItemList.Cell_Empty.get(1L)); Materials.Water.mSolid = Materials.Ice.mSolid; - GT_FluidFactory.builder("molten.glass") - .withLocalizedName("Molten Glass") - .withStateAndTemperature(MOLTEN, 1500) - .buildAndRegister() - .configureMaterials(Materials.Glass) - .registerContainers( + GT_FluidFactory.builder("molten.glass").withLocalizedName("Molten Glass").withStateAndTemperature(MOLTEN, 1500) + .buildAndRegister().configureMaterials(Materials.Glass).registerContainers( GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Glass, 1L), ItemList.Cell_Empty.get(1L), 144); - GT_FluidFactory.builder("molten.redstone") - .withLocalizedName("Molten Redstone") - .withStateAndTemperature(MOLTEN, 500) - .buildAndRegister() - .configureMaterials(Materials.Redstone) + GT_FluidFactory.builder("molten.redstone").withLocalizedName("Molten Redstone") + .withStateAndTemperature(MOLTEN, 500).buildAndRegister().configureMaterials(Materials.Redstone) .registerContainers( GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Redstone, 1L), ItemList.Cell_Empty.get(1L), 144); - GT_FluidFactory.builder("molten.blaze") - .withLocalizedName("Molten Blaze") - .withStateAndTemperature(MOLTEN, 6400) - .buildAndRegister() - .configureMaterials(Materials.Blaze) - .registerContainers( + GT_FluidFactory.builder("molten.blaze").withLocalizedName("Molten Blaze").withStateAndTemperature(MOLTEN, 6400) + .buildAndRegister().configureMaterials(Materials.Blaze).registerContainers( GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Blaze, 1L), ItemList.Cell_Empty.get(1L), 144); - GT_FluidFactory.builder("wet.concrete") - .withLocalizedName("Wet Concrete") - .withStateAndTemperature(MOLTEN, 300) - .buildAndRegister() - .configureMaterials(Materials.Concrete) - .registerContainers( + GT_FluidFactory.builder("wet.concrete").withLocalizedName("Wet Concrete").withStateAndTemperature(MOLTEN, 300) + .buildAndRegister().configureMaterials(Materials.Concrete).registerContainers( GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Concrete, 1L), ItemList.Cell_Empty.get(1L), 144); for (Materials tMaterial : Materials.values()) { - if ((tMaterial.mStandardMoltenFluid == null) - && (tMaterial.contains(SubTag.SMELTING_TO_FLUID)) + if ((tMaterial.mStandardMoltenFluid == null) && (tMaterial.contains(SubTag.SMELTING_TO_FLUID)) && (!tMaterial.contains(SubTag.NO_SMELTING))) { GT_Mod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial); if ((tMaterial.mSmeltInto != tMaterial) && (tMaterial.mSmeltInto.mStandardMoltenFluid == null)) { @@ -1427,640 +1063,450 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { } } - GT_FluidFactory.builder("potion.awkward") - .withLocalizedName("Awkward Brew") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.awkward").withLocalizedName("Awkward Brew").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.thick") - .withLocalizedName("Thick Brew") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.thick").withLocalizedName("Thick Brew").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 32), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.mundane") - .withLocalizedName("Mundane Brew") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.mundane").withLocalizedName("Mundane Brew").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 64), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage") - .withLocalizedName("Harming Brew") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.damage").withLocalizedName("Harming Brew").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8204), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage.strong") - .withLocalizedName("Strong Harming Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.damage.strong").withLocalizedName("Strong Harming Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8236), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage.splash") - .withLocalizedName("Splash Harming Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.damage.splash").withLocalizedName("Splash Harming Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16396), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage.strong.splash") - .withLocalizedName("Strong Splash Harming Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.damage.strong.splash").withLocalizedName("Strong Splash Harming Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16428), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health") - .withLocalizedName("Healing Brew") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.health").withLocalizedName("Healing Brew").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8197), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health.strong") - .withLocalizedName("Strong Healing Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.health.strong").withLocalizedName("Strong Healing Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8229), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health.splash") - .withLocalizedName("Splash Healing Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.health.splash").withLocalizedName("Splash Healing Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16389), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health.strong.splash") - .withLocalizedName("Strong Splash Healing Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.health.strong.splash").withLocalizedName("Strong Splash Healing Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16421), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed") - .withLocalizedName("Swiftness Brew") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.speed").withLocalizedName("Swiftness Brew").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8194), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.strong") - .withLocalizedName("Strong Swiftness Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.speed.strong").withLocalizedName("Strong Swiftness Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8226), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.long") - .withLocalizedName("Stretched Swiftness Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.speed.long").withLocalizedName("Stretched Swiftness Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8258), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.splash") - .withLocalizedName("Splash Swiftness Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.speed.splash").withLocalizedName("Splash Swiftness Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16386), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.strong.splash") - .withLocalizedName("Strong Splash Swiftness Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.speed.strong.splash").withLocalizedName("Strong Splash Swiftness Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16418), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.long.splash") - .withLocalizedName("Stretched Splash Swiftness Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.speed.long.splash").withLocalizedName("Stretched Splash Swiftness Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16450), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength") - .withLocalizedName("Strength Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.strength").withLocalizedName("Strength Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8201), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.strong") - .withLocalizedName("Strong Strength Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.strength.strong").withLocalizedName("Strong Strength Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8233), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.long") - .withLocalizedName("Stretched Strength Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.strength.long").withLocalizedName("Stretched Strength Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8265), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.splash") - .withLocalizedName("Splash Strength Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.strength.splash").withLocalizedName("Splash Strength Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16393), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.strong.splash") - .withLocalizedName("Strong Splash Strength Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.strength.strong.splash").withLocalizedName("Strong Splash Strength Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16425), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.long.splash") - .withLocalizedName("Stretched Splash Strength Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.strength.long.splash").withLocalizedName("Stretched Splash Strength Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16457), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen") - .withLocalizedName("Regenerating Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.regen").withLocalizedName("Regenerating Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8193), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.strong") - .withLocalizedName("Strong Regenerating Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.regen.strong").withLocalizedName("Strong Regenerating Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8225), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.long") - .withLocalizedName("Stretched Regenerating Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.regen.long").withLocalizedName("Stretched Regenerating Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8257), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.splash") - .withLocalizedName("Splash Regenerating Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.regen.splash").withLocalizedName("Splash Regenerating Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16385), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.strong.splash") - .withLocalizedName("Strong Splash Regenerating Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.regen.strong.splash").withLocalizedName("Strong Splash Regenerating Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16417), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.long.splash") - .withLocalizedName("Stretched Splash Regenerating Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.regen.long.splash").withLocalizedName("Stretched Splash Regenerating Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16449), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison") - .withLocalizedName("Poisonous Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.poison").withLocalizedName("Poisonous Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8196), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.strong") - .withLocalizedName("Strong Poisonous Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.poison.strong").withLocalizedName("Strong Poisonous Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8228), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.long") - .withLocalizedName("Stretched Poisonous Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.poison.long").withLocalizedName("Stretched Poisonous Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8260), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.splash") - .withLocalizedName("Splash Poisonous Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.poison.splash").withLocalizedName("Splash Poisonous Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16388), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.strong.splash") - .withLocalizedName("Strong Splash Poisonous Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.poison.strong.splash").withLocalizedName("Strong Splash Poisonous Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16420), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.long.splash") - .withLocalizedName("Stretched Splash Poisonous Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.poison.long.splash").withLocalizedName("Stretched Splash Poisonous Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16452), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.fireresistance") - .withLocalizedName("Fire Resistant Brew") - .withStateAndTemperature(LIQUID, 375) - .buildAndRegister() + GT_FluidFactory.builder("potion.fireresistance").withLocalizedName("Fire Resistant Brew") + .withStateAndTemperature(LIQUID, 375).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8195), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.fireresistance.long") - .withLocalizedName("Stretched Fire Resistant Brew") - .withStateAndTemperature(LIQUID, 375) - .buildAndRegister() + GT_FluidFactory.builder("potion.fireresistance.long").withLocalizedName("Stretched Fire Resistant Brew") + .withStateAndTemperature(LIQUID, 375).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8259), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.fireresistance.splash") - .withLocalizedName("Splash Fire Resistant Brew") - .withStateAndTemperature(LIQUID, 375) - .buildAndRegister() + GT_FluidFactory.builder("potion.fireresistance.splash").withLocalizedName("Splash Fire Resistant Brew") + .withStateAndTemperature(LIQUID, 375).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16387), ItemList.Bottle_Empty.get(1L)); GT_FluidFactory.builder("potion.fireresistance.long.splash") - .withLocalizedName("Stretched Splash Fire Resistant Brew") - .withStateAndTemperature(LIQUID, 375) + .withLocalizedName("Stretched Splash Fire Resistant Brew").withStateAndTemperature(LIQUID, 375) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16451), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.nightvision") - .withLocalizedName("Night Vision Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.nightvision").withLocalizedName("Night Vision Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8198), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.nightvision.long") - .withLocalizedName("Stretched Night Vision Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.nightvision.long").withLocalizedName("Stretched Night Vision Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8262), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.nightvision.splash") - .withLocalizedName("Splash Night Vision Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.nightvision.splash").withLocalizedName("Splash Night Vision Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16390), ItemList.Bottle_Empty.get(1L)); GT_FluidFactory.builder("potion.nightvision.long.splash") - .withLocalizedName("Stretched Splash Night Vision Brew") - .withStateAndTemperature(LIQUID, 295) + .withLocalizedName("Stretched Splash Night Vision Brew").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16454), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness") - .withLocalizedName("Weakening Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.weakness").withLocalizedName("Weakening Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8200), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness.long") - .withLocalizedName("Stretched Weakening Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.weakness.long").withLocalizedName("Stretched Weakening Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8264), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness.splash") - .withLocalizedName("Splash Weakening Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.weakness.splash").withLocalizedName("Splash Weakening Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16392), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness.long.splash") - .withLocalizedName("Stretched Splash Weakening Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.weakness.long.splash").withLocalizedName("Stretched Splash Weakening Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16456), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness") - .withLocalizedName("Lame Brew") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.slowness").withLocalizedName("Lame Brew").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8202), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness.long") - .withLocalizedName("Stretched Lame Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.slowness.long").withLocalizedName("Stretched Lame Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8266), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness.splash") - .withLocalizedName("Splash Lame Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.slowness.splash").withLocalizedName("Splash Lame Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16394), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness.long.splash") - .withLocalizedName("Stretched Splash Lame Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.slowness.long.splash").withLocalizedName("Stretched Splash Lame Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16458), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing") - .withLocalizedName("Fishy Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.waterbreathing").withLocalizedName("Fishy Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8205), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing.long") - .withLocalizedName("Stretched Fishy Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.waterbreathing.long").withLocalizedName("Stretched Fishy Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8269), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing.splash") - .withLocalizedName("Splash Fishy Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.waterbreathing.splash").withLocalizedName("Splash Fishy Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16397), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing.long.splash") - .withLocalizedName("Stretched Splash Fishy Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.waterbreathing.long.splash").withLocalizedName("Stretched Splash Fishy Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16461), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility") - .withLocalizedName("Invisible Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.invisibility").withLocalizedName("Invisible Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8206), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility.long") - .withLocalizedName("Stretched Invisible Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.invisibility.long").withLocalizedName("Stretched Invisible Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8270), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility.splash") - .withLocalizedName("Splash Invisible Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.invisibility.splash").withLocalizedName("Splash Invisible Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16398), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility.long.splash") - .withLocalizedName("Stretched Splash Invisible Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.invisibility.long.splash").withLocalizedName("Stretched Splash Invisible Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16462), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.purpledrink") - .withLocalizedName("Purple Drink") - .withStateAndTemperature(LIQUID, 275) - .buildAndRegister() + GT_FluidFactory.builder("potion.purpledrink").withLocalizedName("Purple Drink") + .withStateAndTemperature(LIQUID, 275).buildAndRegister() .registerPContainers(ItemList.Bottle_Purple_Drink.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.grapejuice") - .withLocalizedName("Grape Juice") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.grapejuice").withLocalizedName("Grape Juice") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Grape_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.wine") - .withLocalizedName("Wine") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Wine.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.vinegar") - .withLocalizedName("Vinegar") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .configureMaterials(Materials.Vinegar) + GT_FluidFactory.builder("potion.wine").withLocalizedName("Wine").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().registerPContainers(ItemList.Bottle_Wine.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.vinegar").withLocalizedName("Vinegar").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().configureMaterials(Materials.Vinegar) .registerPContainers(ItemList.Bottle_Vinegar.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.potatojuice") - .withLocalizedName("Potato Juice") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.potatojuice").withLocalizedName("Potato Juice") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Potato_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.vodka") - .withLocalizedName("Vodka") - .withStateAndTemperature(LIQUID, 275) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Vodka.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.leninade") - .withLocalizedName("Leninade") - .withStateAndTemperature(LIQUID, 275) + GT_FluidFactory.builder("potion.vodka").withLocalizedName("Vodka").withStateAndTemperature(LIQUID, 275) + .buildAndRegister().registerPContainers(ItemList.Bottle_Vodka.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.leninade").withLocalizedName("Leninade").withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Leninade.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.mineralwater") - .withLocalizedName("Mineral Water") - .withStateAndTemperature(LIQUID, 275) - .buildAndRegister() + GT_FluidFactory.builder("potion.mineralwater").withLocalizedName("Mineral Water") + .withStateAndTemperature(LIQUID, 275).buildAndRegister() .registerPContainers(ItemList.Bottle_Mineral_Water.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.saltywater") - .withLocalizedName("Salty Water") - .withStateAndTemperature(LIQUID, 275) - .buildAndRegister() + GT_FluidFactory.builder("potion.saltywater").withLocalizedName("Salty Water") + .withStateAndTemperature(LIQUID, 275).buildAndRegister() .registerPContainers(ItemList.Bottle_Salty_Water.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.reedwater") - .withLocalizedName("Reed Water") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.reedwater").withLocalizedName("Reed Water").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Reed_Water.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.rum") - .withLocalizedName("Rum") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Rum.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.piratebrew") - .withLocalizedName("Pirate Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.rum").withLocalizedName("Rum").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().registerPContainers(ItemList.Bottle_Rum.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.piratebrew").withLocalizedName("Pirate Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Pirate_Brew.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.hopsjuice") - .withLocalizedName("Hops Juice") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.hopsjuice").withLocalizedName("Hops Juice").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Hops_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkbeer") - .withLocalizedName("Dark Beer") - .withStateAndTemperature(LIQUID, 275) + GT_FluidFactory.builder("potion.darkbeer").withLocalizedName("Dark Beer").withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Dark_Beer.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.dragonblood") - .withLocalizedName("Dragon Blood") - .withStateAndTemperature(LIQUID, 375) - .buildAndRegister() + GT_FluidFactory.builder("potion.dragonblood").withLocalizedName("Dragon Blood") + .withStateAndTemperature(LIQUID, 375).buildAndRegister() .registerPContainers(ItemList.Bottle_Dragon_Blood.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.wheatyjuice") - .withLocalizedName("Wheaty Juice") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.wheatyjuice").withLocalizedName("Wheaty Juice") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Wheaty_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.scotch") - .withLocalizedName("Scotch") - .withStateAndTemperature(LIQUID, 275) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Scotch.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.glenmckenner") - .withLocalizedName("Glen McKenner") - .withStateAndTemperature(LIQUID, 275) - .buildAndRegister() + GT_FluidFactory.builder("potion.scotch").withLocalizedName("Scotch").withStateAndTemperature(LIQUID, 275) + .buildAndRegister().registerPContainers(ItemList.Bottle_Scotch.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.glenmckenner").withLocalizedName("Glen McKenner") + .withStateAndTemperature(LIQUID, 275).buildAndRegister() .registerPContainers(ItemList.Bottle_Glen_McKenner.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.wheatyhopsjuice") - .withLocalizedName("Wheaty Hops Juice") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.wheatyhopsjuice").withLocalizedName("Wheaty Hops Juice") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Wheaty_Hops_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.beer") - .withLocalizedName("Beer") - .withStateAndTemperature(LIQUID, 275) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Beer.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.chillysauce") - .withLocalizedName("Chilly Sauce") - .withStateAndTemperature(LIQUID, 375) - .buildAndRegister() + GT_FluidFactory.builder("potion.beer").withLocalizedName("Beer").withStateAndTemperature(LIQUID, 275) + .buildAndRegister().registerPContainers(ItemList.Bottle_Beer.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.chillysauce").withLocalizedName("Chilly Sauce") + .withStateAndTemperature(LIQUID, 375).buildAndRegister() .registerPContainers(ItemList.Bottle_Chilly_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.hotsauce") - .withLocalizedName("Hot Sauce") - .withStateAndTemperature(LIQUID, 380) + GT_FluidFactory.builder("potion.hotsauce").withLocalizedName("Hot Sauce").withStateAndTemperature(LIQUID, 380) .buildAndRegister() .registerPContainers(ItemList.Bottle_Hot_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.diabolosauce") - .withLocalizedName("Diabolo Sauce") - .withStateAndTemperature(LIQUID, 385) - .buildAndRegister() + GT_FluidFactory.builder("potion.diabolosauce").withLocalizedName("Diabolo Sauce") + .withStateAndTemperature(LIQUID, 385).buildAndRegister() .registerPContainers(ItemList.Bottle_Diabolo_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.diablosauce") - .withLocalizedName("Diablo Sauce") - .withStateAndTemperature(LIQUID, 390) - .buildAndRegister() + GT_FluidFactory.builder("potion.diablosauce").withLocalizedName("Diablo Sauce") + .withStateAndTemperature(LIQUID, 390).buildAndRegister() .registerPContainers(ItemList.Bottle_Diablo_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.diablosauce.strong") - .withLocalizedName("Old Man Snitches glitched Diablo Sauce") - .withStateAndTemperature(LIQUID, 999) - .buildAndRegister() + GT_FluidFactory.builder("potion.diablosauce.strong").withLocalizedName("Old Man Snitches glitched Diablo Sauce") + .withStateAndTemperature(LIQUID, 999).buildAndRegister() .registerPContainers(ItemList.Bottle_Snitches_Glitch_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.applejuice") - .withLocalizedName("Apple Juice") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.applejuice").withLocalizedName("Apple Juice") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.cider") - .withLocalizedName("Cider") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Cider.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.goldenapplejuice") - .withLocalizedName("Golden Apple Juice") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.cider").withLocalizedName("Cider").withStateAndTemperature(LIQUID, 295) + .buildAndRegister().registerPContainers(ItemList.Bottle_Cider.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.goldenapplejuice").withLocalizedName("Golden Apple Juice") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Golden_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.goldencider") - .withLocalizedName("Golden Cider") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.goldencider").withLocalizedName("Golden Cider") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Golden_Cider.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.idunsapplejuice") - .withLocalizedName("Idun's Apple Juice") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.idunsapplejuice").withLocalizedName("Idun's Apple Juice") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Iduns_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.notchesbrew") - .withLocalizedName("Notches Brew") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.notchesbrew").withLocalizedName("Notches Brew") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Notches_Brew.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.lemonjuice") - .withLocalizedName("Lemon Juice") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.lemonjuice").withLocalizedName("Lemon Juice") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Lemon_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.limoncello") - .withLocalizedName("Limoncello") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.limoncello").withLocalizedName("Limoncello") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.Bottle_Limoncello.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.lemonade") - .withLocalizedName("Lemonade") - .withStateAndTemperature(LIQUID, 275) + GT_FluidFactory.builder("potion.lemonade").withLocalizedName("Lemonade").withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Lemonade.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.alcopops") - .withLocalizedName("Alcopops") - .withStateAndTemperature(LIQUID, 275) + GT_FluidFactory.builder("potion.alcopops").withLocalizedName("Alcopops").withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Alcopops.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.cavejohnsonsgrenadejuice") - .withLocalizedName("Cave Johnsons Grenade Juice") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers( - ItemList.Bottle_Cave_Johnsons_Grenade_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.cavejohnsonsgrenadejuice").withLocalizedName("Cave Johnsons Grenade Juice") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().registerPContainers( + ItemList.Bottle_Cave_Johnsons_Grenade_Juice.get(1L), + ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkcoffee") - .withLocalizedName("Dark Coffee") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.darkcoffee").withLocalizedName("Dark Coffee") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.ThermosCan_Dark_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkcafeaulait") - .withLocalizedName("Dark Cafe au lait") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.darkcafeaulait").withLocalizedName("Dark Cafe au lait") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.ThermosCan_Dark_Cafe_au_lait.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.coffee") - .withLocalizedName("Coffee") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.coffee").withLocalizedName("Coffee").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.cafeaulait") - .withLocalizedName("Cafe au lait") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.cafeaulait").withLocalizedName("Cafe au lait") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.ThermosCan_Cafe_au_lait.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.laitaucafe") - .withLocalizedName("Lait au cafe") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.laitaucafe").withLocalizedName("Lait au cafe") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.ThermosCan_Lait_au_cafe.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkchocolatemilk") - .withLocalizedName("Bitter Chocolate Milk") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers( - ItemList.ThermosCan_Dark_Chocolate_Milk.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.chocolatemilk") - .withLocalizedName("Chocolate Milk") - .withStateAndTemperature(LIQUID, 295) - .buildAndRegister() + GT_FluidFactory.builder("potion.darkchocolatemilk").withLocalizedName("Bitter Chocolate Milk") + .withStateAndTemperature(LIQUID, 295).buildAndRegister().registerPContainers( + ItemList.ThermosCan_Dark_Chocolate_Milk.get(1L), + ItemList.ThermosCan_Empty.get(1L)); + GT_FluidFactory.builder("potion.chocolatemilk").withLocalizedName("Chocolate Milk") + .withStateAndTemperature(LIQUID, 295).buildAndRegister() .registerPContainers(ItemList.ThermosCan_Chocolate_Milk.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.tea") - .withLocalizedName("Tea") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.tea").withLocalizedName("Tea").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.sweettea") - .withLocalizedName("Sweet Tea") - .withStateAndTemperature(LIQUID, 295) + GT_FluidFactory.builder("potion.sweettea").withLocalizedName("Sweet Tea").withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Sweet_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.icetea") - .withLocalizedName("Ice Tea") - .withStateAndTemperature(LIQUID, 255) + GT_FluidFactory.builder("potion.icetea").withLocalizedName("Ice Tea").withStateAndTemperature(LIQUID, 255) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Ice_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.poison.strong", 750), - ItemList.IC2_Spray_WeedEx.get(1L), - ItemList.Spray_Empty.get(1L))); - - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.poison", 125), - ItemList.Arrow_Head_Glass_Poison.get(1L), - ItemList.Arrow_Head_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.poison.long", 125), - ItemList.Arrow_Head_Glass_Poison_Long.get(1L), - ItemList.Arrow_Head_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.poison.strong", 125), - ItemList.Arrow_Head_Glass_Poison_Strong.get(1L), - ItemList.Arrow_Head_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.slowness", 125), - ItemList.Arrow_Head_Glass_Slowness.get(1L), - ItemList.Arrow_Head_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.slowness.long", 125), - ItemList.Arrow_Head_Glass_Slowness_Long.get(1L), - ItemList.Arrow_Head_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.weakness", 125), - ItemList.Arrow_Head_Glass_Weakness.get(1L), - ItemList.Arrow_Head_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.weakness.long", 125), - ItemList.Arrow_Head_Glass_Weakness_Long.get(1L), - ItemList.Arrow_Head_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("holywater", 125), - ItemList.Arrow_Head_Glass_Holy_Water.get(1L), - ItemList.Arrow_Head_Glass_Emtpy.get(1L))); - - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.poison", 125), - ItemList.Arrow_Wooden_Glass_Poison.get(1L), - ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.poison.long", 125), - ItemList.Arrow_Wooden_Glass_Poison_Long.get(1L), - ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.poison.strong", 125), - ItemList.Arrow_Wooden_Glass_Poison_Strong.get(1L), - ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.slowness", 125), - ItemList.Arrow_Wooden_Glass_Slowness.get(1L), - ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.slowness.long", 125), - ItemList.Arrow_Wooden_Glass_Slowness_Long.get(1L), - ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.weakness", 125), - ItemList.Arrow_Wooden_Glass_Weakness.get(1L), - ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.weakness.long", 125), - ItemList.Arrow_Wooden_Glass_Weakness_Long.get(1L), - ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("holywater", 125), - ItemList.Arrow_Wooden_Glass_Holy_Water.get(1L), - ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); - - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.poison", 125), - ItemList.Arrow_Plastic_Glass_Poison.get(1L), - ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.poison.long", 125), - ItemList.Arrow_Plastic_Glass_Poison_Long.get(1L), - ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.poison.strong", 125), - ItemList.Arrow_Plastic_Glass_Poison_Strong.get(1L), - ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.slowness", 125), - ItemList.Arrow_Plastic_Glass_Slowness.get(1L), - ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.slowness.long", 125), - ItemList.Arrow_Plastic_Glass_Slowness_Long.get(1L), - ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.weakness", 125), - ItemList.Arrow_Plastic_Glass_Weakness.get(1L), - ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("potion.weakness.long", 125), - ItemList.Arrow_Plastic_Glass_Weakness_Long.get(1L), - ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - FluidRegistry.getFluidStack("holywater", 125), - ItemList.Arrow_Plastic_Glass_Holy_Water.get(1L), - ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.poison.strong", 750), + ItemList.IC2_Spray_WeedEx.get(1L), + ItemList.Spray_Empty.get(1L))); + + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.poison", 125), + ItemList.Arrow_Head_Glass_Poison.get(1L), + ItemList.Arrow_Head_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.poison.long", 125), + ItemList.Arrow_Head_Glass_Poison_Long.get(1L), + ItemList.Arrow_Head_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.poison.strong", 125), + ItemList.Arrow_Head_Glass_Poison_Strong.get(1L), + ItemList.Arrow_Head_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.slowness", 125), + ItemList.Arrow_Head_Glass_Slowness.get(1L), + ItemList.Arrow_Head_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.slowness.long", 125), + ItemList.Arrow_Head_Glass_Slowness_Long.get(1L), + ItemList.Arrow_Head_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.weakness", 125), + ItemList.Arrow_Head_Glass_Weakness.get(1L), + ItemList.Arrow_Head_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.weakness.long", 125), + ItemList.Arrow_Head_Glass_Weakness_Long.get(1L), + ItemList.Arrow_Head_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("holywater", 125), + ItemList.Arrow_Head_Glass_Holy_Water.get(1L), + ItemList.Arrow_Head_Glass_Emtpy.get(1L))); + + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.poison", 125), + ItemList.Arrow_Wooden_Glass_Poison.get(1L), + ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.poison.long", 125), + ItemList.Arrow_Wooden_Glass_Poison_Long.get(1L), + ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.poison.strong", 125), + ItemList.Arrow_Wooden_Glass_Poison_Strong.get(1L), + ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.slowness", 125), + ItemList.Arrow_Wooden_Glass_Slowness.get(1L), + ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.slowness.long", 125), + ItemList.Arrow_Wooden_Glass_Slowness_Long.get(1L), + ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.weakness", 125), + ItemList.Arrow_Wooden_Glass_Weakness.get(1L), + ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.weakness.long", 125), + ItemList.Arrow_Wooden_Glass_Weakness_Long.get(1L), + ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("holywater", 125), + ItemList.Arrow_Wooden_Glass_Holy_Water.get(1L), + ItemList.Arrow_Wooden_Glass_Emtpy.get(1L))); + + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.poison", 125), + ItemList.Arrow_Plastic_Glass_Poison.get(1L), + ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.poison.long", 125), + ItemList.Arrow_Plastic_Glass_Poison_Long.get(1L), + ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.poison.strong", 125), + ItemList.Arrow_Plastic_Glass_Poison_Strong.get(1L), + ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.slowness", 125), + ItemList.Arrow_Plastic_Glass_Slowness.get(1L), + ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.slowness.long", 125), + ItemList.Arrow_Plastic_Glass_Slowness_Long.get(1L), + ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.weakness", 125), + ItemList.Arrow_Plastic_Glass_Weakness.get(1L), + ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("potion.weakness.long", 125), + ItemList.Arrow_Plastic_Glass_Weakness_Long.get(1L), + ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + FluidRegistry.getFluidStack("holywater", 125), + ItemList.Arrow_Plastic_Glass_Holy_Water.get(1L), + ItemList.Arrow_Plastic_Glass_Emtpy.get(1L))); if (!GT_Values.D1) { try { Class.forName("codechicken.nei.api.API"); @@ -2113,44 +1559,60 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.ingot, Materials.IronWood, GT_ModHandler.getModItem("TwilightForest", "item.ironwoodIngot", 1L, 0)); + GT_OreDictUnificator + .set(OrePrefixes.gem, Materials.InfusedAir, GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 0)); GT_OreDictUnificator.set( - OrePrefixes.gem, Materials.InfusedAir, GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 0)); - GT_OreDictUnificator.set( - OrePrefixes.gem, Materials.InfusedFire, GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 1)); - GT_OreDictUnificator.set( - OrePrefixes.gem, Materials.InfusedWater, GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 2)); - GT_OreDictUnificator.set( - OrePrefixes.gem, Materials.InfusedEarth, GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 3)); + OrePrefixes.gem, + Materials.InfusedFire, + GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 1)); GT_OreDictUnificator.set( - OrePrefixes.gem, Materials.InfusedOrder, GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 4)); + OrePrefixes.gem, + Materials.InfusedWater, + GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 2)); GT_OreDictUnificator.set( - OrePrefixes.gem, Materials.InfusedEntropy, GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 5)); + OrePrefixes.gem, + Materials.InfusedEarth, + GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 3)); GT_OreDictUnificator.set( - OrePrefixes.nugget, Materials.Mercury, GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 5)); + OrePrefixes.gem, + Materials.InfusedOrder, + GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 4)); GT_OreDictUnificator.set( - OrePrefixes.nugget, Materials.Thaumium, GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 6)); + OrePrefixes.gem, + Materials.InfusedEntropy, + GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 5)); GT_OreDictUnificator.set( - OrePrefixes.ingot, Materials.Thaumium, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 2)); - GT_OreDictUnificator.set( - OrePrefixes.gem, Materials.Mercury, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 3)); - GT_OreDictUnificator.set( - OrePrefixes.gem, Materials.Amber, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 6)); - GT_OreDictUnificator.set( - OrePrefixes.gem, Materials.Firestone, GT_ModHandler.getModItem("Railcraft", "firestone.raw", 1L)); - + OrePrefixes.nugget, + Materials.Mercury, + GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 5)); GT_OreDictUnificator.set( - OrePrefixes.nugget, Materials.Void, GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 7)); + OrePrefixes.nugget, + Materials.Thaumium, + GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 6)); GT_OreDictUnificator.set( - OrePrefixes.ingot, Materials.Void, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 16)); + OrePrefixes.ingot, + Materials.Thaumium, + GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 2)); + GT_OreDictUnificator + .set(OrePrefixes.gem, Materials.Mercury, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 3)); + GT_OreDictUnificator + .set(OrePrefixes.gem, Materials.Amber, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 6)); + GT_OreDictUnificator + .set(OrePrefixes.gem, Materials.Firestone, GT_ModHandler.getModItem("Railcraft", "firestone.raw", 1L)); + + GT_OreDictUnificator + .set(OrePrefixes.nugget, Materials.Void, GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 7)); + GT_OreDictUnificator + .set(OrePrefixes.ingot, Materials.Void, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 16)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.BloodInfusedIron, GT_ModHandler.getModItem("BloodArsenal", "blood_infused_iron", 1L, 0)); - if (GregTech_API.sUnification.get( - ConfigCategories.specialunificationtargets + "." + "railcraft", "plateIron", true)) { - GT_OreDictUnificator.set( - OrePrefixes.plate, Materials.Iron, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0)); + if (GregTech_API.sUnification + .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateIron", true)) { + GT_OreDictUnificator + .set(OrePrefixes.plate, Materials.Iron, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, @@ -2160,10 +1622,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { false); } - if (GregTech_API.sUnification.get( - ConfigCategories.specialunificationtargets + "." + "railcraft", "plateSteel", true)) { + if (GregTech_API.sUnification + .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateSteel", true)) { GT_OreDictUnificator.set( - OrePrefixes.plate, Materials.Steel, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 1)); + OrePrefixes.plate, + Materials.Steel, + GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 1)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, @@ -2173,10 +1637,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { false); } - if (GregTech_API.sUnification.get( - ConfigCategories.specialunificationtargets + "." + "railcraft", "plateTinAlloy", true)) { + if (GregTech_API.sUnification + .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateTinAlloy", true)) { GT_OreDictUnificator.set( - OrePrefixes.plate, Materials.TinAlloy, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 2)); + OrePrefixes.plate, + Materials.TinAlloy, + GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 2)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, @@ -2186,10 +1652,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { false); } - if (GregTech_API.sUnification.get( - ConfigCategories.specialunificationtargets + "." + "railcraft", "plateCopper", true)) { + if (GregTech_API.sUnification + .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateCopper", true)) { GT_OreDictUnificator.set( - OrePrefixes.plate, Materials.Copper, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3)); + OrePrefixes.plate, + Materials.Copper, + GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, @@ -2200,11 +1668,13 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { } GT_OreDictUnificator.set( - OrePrefixes.dust, Materials.Cocoa, GT_ModHandler.getModItem("harvestcraft", "cocoapowderItem", 1L, 0)); + OrePrefixes.dust, + Materials.Cocoa, + GT_ModHandler.getModItem("harvestcraft", "cocoapowderItem", 1L, 0)); GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Coffee, ItemList.IC2_CoffeePowder.get(1L)); - GregTech_API.registerMachineBlock( - GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("reinforcedGlass", 0)), 0); + GregTech_API + .registerMachineBlock(GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("reinforcedGlass", 0)), 0); GregTech_API.sSolenoidCoilCasings = new GT_Cyclotron_Coils(); } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index d04d214073..ae2bc1b5f1 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1,5 +1,10 @@ package gregtech.loaders.preload; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import codechicken.nei.api.API; import cpw.mods.fml.common.Loader; import gregtech.GT_Mod; @@ -22,188 +27,185 @@ import gregtech.common.tileentities.storage.*; import gregtech.loaders.postload.GT_PCBFactoryMaterialLoader; import gregtech.loaders.postload.GT_ProcessingArrayRecipeLoader; import ic2.core.Ic2Items; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; // Free IDs left for machines in GT as of 29th of July 2022 - Colen. Please try use them up in order. -// 358 -// 359 -// 366 -// 367 -// 368 -// 369 -// 370 -// 376 -// 377 -// 378 -// 379 -// 386 -// 387 -// 388 -// 389 -// 390 -// 396 -// 397 -// 398 -// 399 -// 410 -// 419 -// 426 -// 427 -// 428 -// 429 -// 430 -// 436 -// 437 -// 438 -// 439 -// 446 -// 447 -// 448 -// 449 -// 450 -// 456 -// 457 -// 458 -// 459 -// 466 -// 467 -// 468 -// 469 -// 470 -// 476 -// 477 -// 478 -// 479 -// 486 -// 487 -// 488 -// 489 -// 496 -// 497 -// 498 -// 499 -// 506 -// 507 -// 508 -// 509 -// 518 -// 519 -// 526 -// 530 -// 537 -// 538 -// 539 -// 546 -// 547 -// 548 -// 549 -// 550 -// 556 -// 557 -// 558 -// 559 -// 566 -// 567 -// 576 -// 577 -// 578 -// 579 -// 586 -// 587 -// 588 -// 589 -// 590 -// 596 -// 597 -// 598 -// 599 -// 607 -// 608 -// 609 -// 610 -// 616 -// 617 -// 618 -// 619 -// 626 -// 627 -// 628 -// 629 -// 630 -// 636 -// 637 -// 639 -// 646 -// 647 -// 648 -// 649 -// 650 -// 656 -// 657 -// 658 -// 659 -// 666 -// 667 -// 668 -// 669 -// 670 -// 676 -// 677 -// 678 -// 682 -// 683 -// 684 -// 686 -// 687 -// 688 -// 689 -// 702 -// 703 -// 704 -// 705 -// 706 -// 707 -// 708 -// 709 -// 714 -// 715 -// 716 -// 717 -// 718 -// 719 -// 721 -// 722 -// 723 -// 724 -// 725 -// 726 -// 727 -// 728 -// 729 -// 730 -// 731 -// 732 -// 733 -// 734 -// 735 -// 736 -// 737 -// 738 -// 739 -// 741 -// 742 -// 743 -// 744 -// 745 -// 746 -// 747 -// 748 -// 749 +// 358 +// 359 +// 366 +// 367 +// 368 +// 369 +// 370 +// 376 +// 377 +// 378 +// 379 +// 386 +// 387 +// 388 +// 389 +// 390 +// 396 +// 397 +// 398 +// 399 +// 410 +// 419 +// 426 +// 427 +// 428 +// 429 +// 430 +// 436 +// 437 +// 438 +// 439 +// 446 +// 447 +// 448 +// 449 +// 450 +// 456 +// 457 +// 458 +// 459 +// 466 +// 467 +// 468 +// 469 +// 470 +// 476 +// 477 +// 478 +// 479 +// 486 +// 487 +// 488 +// 489 +// 496 +// 497 +// 498 +// 499 +// 506 +// 507 +// 508 +// 509 +// 518 +// 519 +// 526 +// 530 +// 537 +// 538 +// 539 +// 546 +// 547 +// 548 +// 549 +// 550 +// 556 +// 557 +// 558 +// 559 +// 566 +// 567 +// 576 +// 577 +// 578 +// 579 +// 586 +// 587 +// 588 +// 589 +// 590 +// 596 +// 597 +// 598 +// 599 +// 607 +// 608 +// 609 +// 610 +// 616 +// 617 +// 618 +// 619 +// 626 +// 627 +// 628 +// 629 +// 630 +// 636 +// 637 +// 639 +// 646 +// 647 +// 648 +// 649 +// 650 +// 656 +// 657 +// 658 +// 659 +// 666 +// 667 +// 668 +// 669 +// 670 +// 676 +// 677 +// 678 +// 682 +// 683 +// 684 +// 686 +// 687 +// 688 +// 689 +// 702 +// 703 +// 704 +// 705 +// 706 +// 707 +// 708 +// 709 +// 714 +// 715 +// 716 +// 717 +// 718 +// 719 +// 721 +// 722 +// 723 +// 724 +// 725 +// 726 +// 727 +// 728 +// 729 +// 730 +// 731 +// 732 +// 733 +// 734 +// 735 +// 736 +// 737 +// 738 +// 739 +// 741 +// 742 +// 743 +// 744 +// 745 +// 746 +// 747 +// 748 +// 749 public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRCUIT RECIPES AND USAGES + private static final String aTextWire1 = "wire."; private static final String aTextCable1 = "cable."; private static final String aTextWire2 = " Wire"; @@ -218,593 +220,496 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static final String aTextMotorWire = "EWE"; private static final String aTextWirePump = "WPW"; public static final String imagination = EnumChatFormatting.RESET + "You just need " - + EnumChatFormatting.DARK_PURPLE + "I" + EnumChatFormatting.LIGHT_PURPLE + "m" + EnumChatFormatting.DARK_RED - + "a" + EnumChatFormatting.RED + "g" + EnumChatFormatting.YELLOW + "i" + EnumChatFormatting.GREEN + "n" - + EnumChatFormatting.AQUA + "a" + EnumChatFormatting.DARK_AQUA + "t" + EnumChatFormatting.BLUE + "i" - + EnumChatFormatting.DARK_BLUE + "o" + EnumChatFormatting.DARK_PURPLE + "n" + EnumChatFormatting.RESET + + EnumChatFormatting.DARK_PURPLE + + "I" + + EnumChatFormatting.LIGHT_PURPLE + + "m" + + EnumChatFormatting.DARK_RED + + "a" + + EnumChatFormatting.RED + + "g" + + EnumChatFormatting.YELLOW + + "i" + + EnumChatFormatting.GREEN + + "n" + + EnumChatFormatting.AQUA + + "a" + + EnumChatFormatting.DARK_AQUA + + "t" + + EnumChatFormatting.BLUE + + "i" + + EnumChatFormatting.DARK_BLUE + + "o" + + EnumChatFormatting.DARK_PURPLE + + "n" + + EnumChatFormatting.RESET + " to use this."; - private static final long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE + private static final long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED; private static final long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | bits; private static final Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems"); private static void run1() { - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Polytetrafluoroethylene.get(1L), bits, new Object[] { - "PIP", - "IFI", - "PIP", - 'P', - OrePrefixes.plate.get(Materials.Polytetrafluoroethylene), - 'F', - OrePrefixes.frameGt.get(Materials.Polytetrafluoroethylene), - 'I', - OrePrefixes.pipeMedium.get(Materials.Polytetrafluoroethylene) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Polybenzimidazole.get(1L), bits, new Object[] { - "PIP", - "IFI", - "PIP", - 'P', - OrePrefixes.plate.get(Materials.Polybenzimidazole), - 'F', - OrePrefixes.frameGt.get(Materials.Polybenzimidazole), - 'I', - OrePrefixes.pipeMedium.get(Materials.Polybenzimidazole) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_ULV.get(1L), bits, new Object[] { - aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.WroughtIron) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_LV.get(1L), bits, new Object[] { - aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_MV.get(1L), bits, new Object[] { - aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_HV.get(1L), bits, new Object[] { - aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.StainlessSteel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_EV.get(1L), bits, new Object[] { - aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Titanium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_IV.get(1L), bits, new Object[] { - aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.TungstenSteel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_LuV.get(1L), bits, new Object[] { - aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Chrome) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_ZPM.get(1L), bits, new Object[] { - aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Iridium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_UV.get(1L), bits, new Object[] { - aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Osmium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_MAX.get(1L), bits, new Object[] { - aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Neutronium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_BronzePlatedBricks.get(1L), bits, new Object[] { - "PhP", - "PBP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Bronze), - 'B', - new ItemStack(Blocks.brick_block, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'F', - OrePrefixes.frameGt.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_StableTitanium.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Titanium), - 'F', - OrePrefixes.frameGt.get(Materials.Titanium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_HeatProof.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Invar), - 'F', - OrePrefixes.frameGt.get(Materials.Invar) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_FrostProof.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'F', - OrePrefixes.frameGt.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_CleanStainlessSteel.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'F', - OrePrefixes.frameGt.get(Materials.StainlessSteel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_RobustTungstenSteel.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'F', - OrePrefixes.frameGt.get(Materials.TungstenSteel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_MiningOsmiridium.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Osmiridium), - 'F', - OrePrefixes.frameGt.get(Materials.Osmiridium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_MiningNeutronium.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Neutronium), - 'F', - OrePrefixes.frameGt.get(Materials.Neutronium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_MiningBlackPlutonium.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.BlackPlutonium), - 'F', - OrePrefixes.frameGt.get(Materials.BlackPlutonium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Magnalium), - 'F', - OrePrefixes.frameGt.get(Materials.BlueSteel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine1.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'F', - ItemList.Casing_Turbine - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine2.get(1L), bits, new Object[] { - "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', ItemList.Casing_Turbine - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine3.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'F', - ItemList.Casing_Turbine - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_TurbineGasAdvanced.get(1L), bits, new Object[] { - "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.HSSS), 'F', ItemList.Casing_Turbine - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Bronze.get(1L), bits, new Object[] { - "PIP", - "IFI", - "PIP", - 'P', - OrePrefixes.plate.get(Materials.Bronze), - 'F', - OrePrefixes.frameGt.get(Materials.Bronze), - 'I', - OrePrefixes.pipeMedium.get(Materials.Bronze) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Steel.get(1L), bits, new Object[] { - "PIP", - "IFI", - "PIP", - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'F', - OrePrefixes.frameGt.get(Materials.Steel), - 'I', - OrePrefixes.pipeMedium.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Titanium.get(1L), bits, new Object[] { - "PIP", - "IFI", - "PIP", - 'P', - OrePrefixes.plate.get(Materials.Titanium), - 'F', - OrePrefixes.frameGt.get(Materials.Titanium), - 'I', - OrePrefixes.pipeMedium.get(Materials.Titanium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_TungstenSteel.get(1L), bits, new Object[] { - "PIP", - "IFI", - "PIP", - 'P', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'F', - OrePrefixes.frameGt.get(Materials.TungstenSteel), - 'I', - OrePrefixes.pipeMedium.get(Materials.TungstenSteel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_Bronze.get(1L), bits, new Object[] { - "PhP", - "GFG", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Bronze), - 'F', - OrePrefixes.frameGt.get(Materials.Bronze), - 'G', - OrePrefixes.gearGt.get(Materials.Bronze) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_Steel.get(1L), bits, new Object[] { - "PhP", - "GFG", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'F', - OrePrefixes.frameGt.get(Materials.Steel), - 'G', - OrePrefixes.gearGt.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_Titanium.get(1L), bits, new Object[] { - "PhP", - "GFG", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'F', - OrePrefixes.frameGt.get(Materials.Titanium), - 'G', - OrePrefixes.gearGt.get(Materials.Titanium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_TungstenSteel.get(1L), bits, new Object[] { - "PhP", - "GFG", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'F', - OrePrefixes.frameGt.get(Materials.TungstenSteel), - 'G', - ItemList.Robot_Arm_IV - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Grate.get(1L), bits, new Object[] { - "PVP", - "PFP", - aTextPlateMotor, - 'P', - new ItemStack(Blocks.iron_bars, 1), - 'F', - OrePrefixes.frameGt.get(Materials.Steel), - 'M', - ItemList.Electric_Motor_MV, - 'V', - OrePrefixes.rotor.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Assembler.get(1L), bits, new Object[] { - "PVP", - "PFP", - aTextPlateMotor, - 'P', - OrePrefixes.circuit.get(Materials.Ultimate), - 'F', - OrePrefixes.frameGt.get(Materials.TungstenSteel), - 'M', - ItemList.Electric_Motor_IV, - 'V', - OrePrefixes.circuit.get(Materials.Master) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Bronze.get(1L), bits, new Object[] { - "PSP", - "SFS", - "PSP", - 'P', - OrePrefixes.plate.get(Materials.Bronze), - 'F', - OrePrefixes.frameGt.get(Materials.Bronze), - 'S', - OrePrefixes.stick.get(Materials.Bronze) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Steel.get(1L), bits, new Object[] { - "PSP", - "SFS", - "PSP", - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'F', - OrePrefixes.frameGt.get(Materials.Steel), - 'S', - OrePrefixes.stick.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Titanium.get(1L), bits, new Object[] { - "PSP", - "SFS", - "PSP", - 'P', - OrePrefixes.plate.get(Materials.Titanium), - 'F', - OrePrefixes.frameGt.get(Materials.Titanium), - 'S', - OrePrefixes.stick.get(Materials.Titanium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_TungstenSteel.get(1L), bits, new Object[] { - "PSP", - "SFS", - "PSP", - 'P', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'F', - OrePrefixes.frameGt.get(Materials.TungstenSteel), - 'S', - OrePrefixes.stick.get(Materials.TungstenSteel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Stripes_A.get(1L), bits, new Object[] { - "Y ", " M ", " B", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Stripes_B.get(1L), bits, new Object[] { - " Y", " M ", "B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_RadioactiveHazard.get(1L), bits, new Object[] { - " YB", " M ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_BioHazard.get(1L), bits, new Object[] { - " Y ", " MB", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_ExplosionHazard.get(1L), bits, new Object[] { - " Y ", " M ", " B", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_FireHazard.get(1L), bits, new Object[] { - " Y ", " M ", " B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_AcidHazard.get(1L), bits, new Object[] { - " Y ", " M ", "B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_MagicHazard.get(1L), bits, new Object[] { - " Y ", "BM ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_FrostHazard.get(1L), bits, new Object[] { - "BY ", " M ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_NoiseHazard.get(1L), bits, new Object[] { - " ", " M ", "BY ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Advanced_Iridium.get(1L), bits, new Object[] { - "PhP", - "PFP", - aTextPlateWrench, - 'P', - OrePrefixes.plate.get(Materials.Iridium), - 'F', - OrePrefixes.frameGt.get(Materials.Iridium) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Pipe_Polytetrafluoroethylene.get(1L), + bits, + new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene), 'F', + OrePrefixes.frameGt.get(Materials.Polytetrafluoroethylene), 'I', + OrePrefixes.pipeMedium.get(Materials.Polytetrafluoroethylene) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Pipe_Polybenzimidazole.get(1L), + bits, + new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole), 'F', + OrePrefixes.frameGt.get(Materials.Polybenzimidazole), 'I', + OrePrefixes.pipeMedium.get(Materials.Polybenzimidazole) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_ULV.get(1L), + bits, + new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', + OrePrefixes.plate.get(Materials.WroughtIron) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_LV.get(1L), + bits, + new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_MV.get(1L), + bits, + new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', + OrePrefixes.plate.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_HV.get(1L), + bits, + new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', + OrePrefixes.plate.get(Materials.StainlessSteel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_EV.get(1L), + bits, + new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', + OrePrefixes.plate.get(Materials.Titanium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_IV.get(1L), + bits, + new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', + OrePrefixes.plate.get(Materials.TungstenSteel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_LuV.get(1L), + bits, + new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', + OrePrefixes.plate.get(Materials.Chrome) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_ZPM.get(1L), + bits, + new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', + OrePrefixes.plate.get(Materials.Iridium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_UV.get(1L), + bits, + new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', + OrePrefixes.plate.get(Materials.Osmium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_MAX.get(1L), + bits, + new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', + OrePrefixes.plate.get(Materials.Neutronium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_BronzePlatedBricks.get(1L), + bits, + new Object[] { "PhP", "PBP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Bronze), 'B', + new ItemStack(Blocks.brick_block, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', + OrePrefixes.frameGt.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_StableTitanium.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', + OrePrefixes.frameGt.get(Materials.Titanium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_HeatProof.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Invar), 'F', + OrePrefixes.frameGt.get(Materials.Invar) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_FrostProof.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Aluminium), 'F', + OrePrefixes.frameGt.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_CleanStainlessSteel.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.StainlessSteel), + 'F', OrePrefixes.frameGt.get(Materials.StainlessSteel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_RobustTungstenSteel.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', + OrePrefixes.frameGt.get(Materials.TungstenSteel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_MiningOsmiridium.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Osmiridium), 'F', + OrePrefixes.frameGt.get(Materials.Osmiridium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_MiningNeutronium.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Neutronium), 'F', + OrePrefixes.frameGt.get(Materials.Neutronium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_MiningBlackPlutonium.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.BlackPlutonium), + 'F', OrePrefixes.frameGt.get(Materials.BlackPlutonium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Turbine.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Magnalium), 'F', + OrePrefixes.frameGt.get(Materials.BlueSteel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Turbine1.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.StainlessSteel), + 'F', ItemList.Casing_Turbine }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Turbine2.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', + ItemList.Casing_Turbine }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Turbine3.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', + ItemList.Casing_Turbine }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_TurbineGasAdvanced.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.HSSS), 'F', + ItemList.Casing_Turbine }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Pipe_Bronze.get(1L), + bits, + new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', + OrePrefixes.frameGt.get(Materials.Bronze), 'I', OrePrefixes.pipeMedium.get(Materials.Bronze) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Pipe_Steel.get(1L), + bits, + new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Steel), 'F', + OrePrefixes.frameGt.get(Materials.Steel), 'I', OrePrefixes.pipeMedium.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Pipe_Titanium.get(1L), + bits, + new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', + OrePrefixes.frameGt.get(Materials.Titanium), 'I', + OrePrefixes.pipeMedium.get(Materials.Titanium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Pipe_TungstenSteel.get(1L), + bits, + new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', + OrePrefixes.frameGt.get(Materials.TungstenSteel), 'I', + OrePrefixes.pipeMedium.get(Materials.TungstenSteel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Gearbox_Bronze.get(1L), + bits, + new Object[] { "PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', + OrePrefixes.frameGt.get(Materials.Bronze), 'G', OrePrefixes.gearGt.get(Materials.Bronze) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Gearbox_Steel.get(1L), + bits, + new Object[] { "PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', + OrePrefixes.frameGt.get(Materials.Steel), 'G', OrePrefixes.gearGt.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Gearbox_Titanium.get(1L), + bits, + new Object[] { "PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', + OrePrefixes.frameGt.get(Materials.Titanium), 'G', OrePrefixes.gearGt.get(Materials.Titanium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Gearbox_TungstenSteel.get(1L), + bits, + new Object[] { "PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', + OrePrefixes.frameGt.get(Materials.TungstenSteel), 'G', ItemList.Robot_Arm_IV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Grate.get(1L), + bits, + new Object[] { "PVP", "PFP", aTextPlateMotor, 'P', new ItemStack(Blocks.iron_bars, 1), 'F', + OrePrefixes.frameGt.get(Materials.Steel), 'M', ItemList.Electric_Motor_MV, 'V', + OrePrefixes.rotor.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Assembler.get(1L), + bits, + new Object[] { "PVP", "PFP", aTextPlateMotor, 'P', OrePrefixes.circuit.get(Materials.Ultimate), 'F', + OrePrefixes.frameGt.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'V', + OrePrefixes.circuit.get(Materials.Master) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Firebox_Bronze.get(1L), + bits, + new Object[] { "PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', + OrePrefixes.frameGt.get(Materials.Bronze), 'S', OrePrefixes.stick.get(Materials.Bronze) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Firebox_Steel.get(1L), + bits, + new Object[] { "PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Steel), 'F', + OrePrefixes.frameGt.get(Materials.Steel), 'S', OrePrefixes.stick.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Firebox_Titanium.get(1L), + bits, + new Object[] { "PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', + OrePrefixes.frameGt.get(Materials.Titanium), 'S', OrePrefixes.stick.get(Materials.Titanium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Firebox_TungstenSteel.get(1L), + bits, + new Object[] { "PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', + OrePrefixes.frameGt.get(Materials.TungstenSteel), 'S', + OrePrefixes.stick.get(Materials.TungstenSteel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Stripes_A.get(1L), + bits, + new Object[] { "Y ", " M ", " B", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', + Dyes.dyeBlack }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Stripes_B.get(1L), + bits, + new Object[] { " Y", " M ", "B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', + Dyes.dyeBlack }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_RadioactiveHazard.get(1L), + bits, + new Object[] { " YB", " M ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', + Dyes.dyeBlack }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_BioHazard.get(1L), + bits, + new Object[] { " Y ", " MB", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', + Dyes.dyeBlack }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_ExplosionHazard.get(1L), + bits, + new Object[] { " Y ", " M ", " B", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', + Dyes.dyeBlack }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_FireHazard.get(1L), + bits, + new Object[] { " Y ", " M ", " B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', + Dyes.dyeBlack }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_AcidHazard.get(1L), + bits, + new Object[] { " Y ", " M ", "B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', + Dyes.dyeBlack }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_MagicHazard.get(1L), + bits, + new Object[] { " Y ", "BM ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', + Dyes.dyeBlack }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_FrostHazard.get(1L), + bits, + new Object[] { "BY ", " M ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', + Dyes.dyeBlack }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_NoiseHazard.get(1L), + bits, + new Object[] { " ", " M ", "BY ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', + Dyes.dyeBlack }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Advanced_Iridium.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Iridium), 'F', + OrePrefixes.frameGt.get(Materials.Iridium) }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Casing_SolidSteel.get(1L), bits, new Object[] {ItemList.Casing_Stripes_A}); + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { ItemList.Casing_Stripes_A }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Casing_SolidSteel.get(1L), bits, new Object[] {ItemList.Casing_Stripes_B}); + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { ItemList.Casing_Stripes_B }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Casing_SolidSteel.get(1L), bits, new Object[] {ItemList.Casing_RadioactiveHazard}); + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { ItemList.Casing_RadioactiveHazard }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Casing_SolidSteel.get(1L), bits, new Object[] {ItemList.Casing_BioHazard}); + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { ItemList.Casing_BioHazard }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Casing_SolidSteel.get(1L), bits, new Object[] {ItemList.Casing_ExplosionHazard}); + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { ItemList.Casing_ExplosionHazard }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Casing_SolidSteel.get(1L), bits, new Object[] {ItemList.Casing_FireHazard}); + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { ItemList.Casing_FireHazard }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Casing_SolidSteel.get(1L), bits, new Object[] {ItemList.Casing_AcidHazard}); + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { ItemList.Casing_AcidHazard }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Casing_SolidSteel.get(1L), bits, new Object[] {ItemList.Casing_MagicHazard}); + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { ItemList.Casing_MagicHazard }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Casing_SolidSteel.get(1L), bits, new Object[] {ItemList.Casing_FrostHazard}); + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { ItemList.Casing_FrostHazard }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Casing_SolidSteel.get(1L), bits, new Object[] {ItemList.Casing_NoiseHazard}); - - ItemList.Machine_Bricked_BlastFurnace.set(new GT_MetaTileEntity_BrickedBlastFurnace( - 140, "multimachine.brickedblastfurnace", "Bricked Blast Furnace") - .getStackForm(1L)); + ItemList.Casing_SolidSteel.get(1L), + bits, + new Object[] { ItemList.Casing_NoiseHazard }); + + ItemList.Machine_Bricked_BlastFurnace.set( + new GT_MetaTileEntity_BrickedBlastFurnace( + 140, + "multimachine.brickedblastfurnace", + "Bricked Blast Furnace").getStackForm(1L)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Bricked_BlastFurnace.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "BFB", "FwF", "BFB", 'B', ItemList.Casing_Firebricks, 'F', OreDictNames.craftingIronFurnace - }); - - ItemList.Hull_Bronze.set(new GT_MetaTileEntity_BasicHull_Bronze( - 1, "hull.bronze", "Bronze Hull", 0, "For your first Steam Machines") - .getStackForm(1L)); - ItemList.Hull_Bronze_Bricks.set(new GT_MetaTileEntity_BasicHull_BronzeBricks( - 2, "hull.bronze_bricked", "Bricked Bronze Hull", 0, "For your first Steam Machines") - .getStackForm(1L)); + new Object[] { "BFB", "FwF", "BFB", 'B', ItemList.Casing_Firebricks, 'F', + OreDictNames.craftingIronFurnace }); + + ItemList.Hull_Bronze.set( + new GT_MetaTileEntity_BasicHull_Bronze( + 1, + "hull.bronze", + "Bronze Hull", + 0, + "For your first Steam Machines").getStackForm(1L)); + ItemList.Hull_Bronze_Bricks.set( + new GT_MetaTileEntity_BasicHull_BronzeBricks( + 2, + "hull.bronze_bricked", + "Bricked Bronze Hull", + 0, + "For your first Steam Machines").getStackForm(1L)); ItemList.Hull_HP.set( new GT_MetaTileEntity_BasicHull_Steel(3, "hull.steel", "Steel Hull", 0, "For improved Steam Machines") .getStackForm(1L)); - ItemList.Hull_HP_Bricks.set(new GT_MetaTileEntity_BasicHull_SteelBricks( - 4, "hull.steel_bricked", "Bricked Wrought Iron Hull", 0, "For improved Steam Machines") - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Hull_Bronze.get(1L), bits, new Object[] { - aTextPlate, "PhP", aTextPlate, 'P', OrePrefixes.plate.get(Materials.Bronze) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_Bronze_Bricks.get(1L), bits, new Object[] { - aTextPlate, - "PhP", - "BBB", - 'P', - OrePrefixes.plate.get(Materials.Bronze), - 'B', - new ItemStack(Blocks.brick_block, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_HP.get(1L), bits, new Object[] { - aTextPlate, "PhP", aTextPlate, 'P', OrePrefixes.plate.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_HP_Bricks.get(1L), bits, new Object[] { - aTextPlate, - "PhP", - "BBB", - 'P', - OrePrefixes.plate.get(Materials.WroughtIron), - 'B', - new ItemStack(Blocks.brick_block, 1) - }); - - ItemList.Hull_ULV.set(new GT_MetaTileEntity_BasicHull(10, "hull.tier.00", "ULV Machine Hull", 0, imagination) - .getStackForm(1L)); - ItemList.Hull_LV.set(new GT_MetaTileEntity_BasicHull(11, "hull.tier.01", "LV Machine Hull", 1, imagination) - .getStackForm(1L)); - ItemList.Hull_MV.set(new GT_MetaTileEntity_BasicHull(12, "hull.tier.02", "MV Machine Hull", 2, imagination) - .getStackForm(1L)); - ItemList.Hull_HV.set(new GT_MetaTileEntity_BasicHull(13, "hull.tier.03", "HV Machine Hull", 3, imagination) - .getStackForm(1L)); - ItemList.Hull_EV.set(new GT_MetaTileEntity_BasicHull(14, "hull.tier.04", "EV Machine Hull", 4, imagination) - .getStackForm(1L)); - ItemList.Hull_IV.set(new GT_MetaTileEntity_BasicHull(15, "hull.tier.05", "IV Machine Hull", 5, imagination) - .getStackForm(1L)); - ItemList.Hull_LuV.set(new GT_MetaTileEntity_BasicHull(16, "hull.tier.06", "LuV Machine Hull", 6, imagination) - .getStackForm(1L)); - ItemList.Hull_ZPM.set(new GT_MetaTileEntity_BasicHull(17, "hull.tier.07", "ZPM Machine Hull", 7, imagination) - .getStackForm(1L)); - ItemList.Hull_UV.set(new GT_MetaTileEntity_BasicHull(18, "hull.tier.08", "UV Machine Hull", 8, imagination) - .getStackForm(1L)); - ItemList.Hull_MAX.set(new GT_MetaTileEntity_BasicHull(19, "hull.tier.09", "UHV Machine Hull", 9, imagination) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Hull_ULV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_ULV, - 'C', - OrePrefixes.cableGt01.get(Materials.Lead), - 'H', - OrePrefixes.plate.get(Materials.WroughtIron), - 'P', - OrePrefixes.plate.get(Materials.Wood) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_LV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_LV, - 'C', - OrePrefixes.cableGt01.get(Materials.Tin), - 'H', - OrePrefixes.plate.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.WroughtIron) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_MV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_MV, - 'C', - OrePrefixes.cableGt01.get(Materials.AnyCopper), - 'H', - OrePrefixes.plate.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.WroughtIron) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_HV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_HV, - 'C', - OrePrefixes.cableGt01.get(Materials.Gold), - 'H', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.Plastic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_EV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_EV, - 'C', - OrePrefixes.cableGt01.get(Materials.Aluminium), - 'H', - OrePrefixes.plate.get(Materials.Titanium), - 'P', - OrePrefixes.plate.get(Materials.Plastic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_IV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_IV, - 'C', - OrePrefixes.cableGt01.get(Materials.Tungsten), - 'H', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'P', - OrePrefixes.plate.get(Materials.Polytetrafluoroethylene) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_LuV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_LuV, - 'C', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium), - 'H', - OrePrefixes.plate.get(Materials.Chrome), - 'P', - OrePrefixes.plate.get(Materials.Polytetrafluoroethylene) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_ZPM.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_ZPM, - 'C', - OrePrefixes.cableGt02.get(Materials.Naquadah), - 'H', - OrePrefixes.plate.get(Materials.Iridium), - 'P', - OrePrefixes.plate.get(Materials.Polybenzimidazole) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_UV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_UV, - 'C', - OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), - 'H', - OrePrefixes.plate.get(Materials.Osmium), - 'P', - OrePrefixes.plate.get(Materials.Polybenzimidazole) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_MAX.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_MAX, - 'C', - OrePrefixes.wireGt04.get(Materials.SuperconductorUV), - 'H', - OrePrefixes.plate.get(Materials.Neutronium), - 'P', - OrePrefixes.plate.get(Materials.Polybenzimidazole) - }); + ItemList.Hull_HP_Bricks.set( + new GT_MetaTileEntity_BasicHull_SteelBricks( + 4, + "hull.steel_bricked", + "Bricked Wrought Iron Hull", + 0, + "For improved Steam Machines").getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_Bronze.get(1L), + bits, + new Object[] { aTextPlate, "PhP", aTextPlate, 'P', OrePrefixes.plate.get(Materials.Bronze) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_Bronze_Bricks.get(1L), + bits, + new Object[] { aTextPlate, "PhP", "BBB", 'P', OrePrefixes.plate.get(Materials.Bronze), 'B', + new ItemStack(Blocks.brick_block, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_HP.get(1L), + bits, + new Object[] { aTextPlate, "PhP", aTextPlate, 'P', OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_HP_Bricks.get(1L), + bits, + new Object[] { aTextPlate, "PhP", "BBB", 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'B', + new ItemStack(Blocks.brick_block, 1) }); + + ItemList.Hull_ULV.set( + new GT_MetaTileEntity_BasicHull(10, "hull.tier.00", "ULV Machine Hull", 0, imagination) + .getStackForm(1L)); + ItemList.Hull_LV.set( + new GT_MetaTileEntity_BasicHull(11, "hull.tier.01", "LV Machine Hull", 1, imagination) + .getStackForm(1L)); + ItemList.Hull_MV.set( + new GT_MetaTileEntity_BasicHull(12, "hull.tier.02", "MV Machine Hull", 2, imagination) + .getStackForm(1L)); + ItemList.Hull_HV.set( + new GT_MetaTileEntity_BasicHull(13, "hull.tier.03", "HV Machine Hull", 3, imagination) + .getStackForm(1L)); + ItemList.Hull_EV.set( + new GT_MetaTileEntity_BasicHull(14, "hull.tier.04", "EV Machine Hull", 4, imagination) + .getStackForm(1L)); + ItemList.Hull_IV.set( + new GT_MetaTileEntity_BasicHull(15, "hull.tier.05", "IV Machine Hull", 5, imagination) + .getStackForm(1L)); + ItemList.Hull_LuV.set( + new GT_MetaTileEntity_BasicHull(16, "hull.tier.06", "LuV Machine Hull", 6, imagination) + .getStackForm(1L)); + ItemList.Hull_ZPM.set( + new GT_MetaTileEntity_BasicHull(17, "hull.tier.07", "ZPM Machine Hull", 7, imagination) + .getStackForm(1L)); + ItemList.Hull_UV.set( + new GT_MetaTileEntity_BasicHull(18, "hull.tier.08", "UV Machine Hull", 8, imagination) + .getStackForm(1L)); + ItemList.Hull_MAX.set( + new GT_MetaTileEntity_BasicHull(19, "hull.tier.09", "UHV Machine Hull", 9, imagination) + .getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_ULV.get(1L), + GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextCableHull, 'M', ItemList.Casing_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead), + 'H', OrePrefixes.plate.get(Materials.WroughtIron), 'P', + OrePrefixes.plate.get(Materials.Wood) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_LV.get(1L), + GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextCableHull, 'M', ItemList.Casing_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), + 'H', OrePrefixes.plate.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.WroughtIron) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_MV.get(1L), + GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextCableHull, 'M', ItemList.Casing_MV, 'C', + OrePrefixes.cableGt01.get(Materials.AnyCopper), 'H', OrePrefixes.plate.get(Materials.Aluminium), + 'P', OrePrefixes.plate.get(Materials.WroughtIron) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_HV.get(1L), + GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextCableHull, 'M', ItemList.Casing_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold), + 'H', OrePrefixes.plate.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.Plastic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_EV.get(1L), + GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextCableHull, 'M', ItemList.Casing_EV, 'C', + OrePrefixes.cableGt01.get(Materials.Aluminium), 'H', OrePrefixes.plate.get(Materials.Titanium), + 'P', OrePrefixes.plate.get(Materials.Plastic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_IV.get(1L), + GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextCableHull, 'M', ItemList.Casing_IV, 'C', + OrePrefixes.cableGt01.get(Materials.Tungsten), 'H', + OrePrefixes.plate.get(Materials.TungstenSteel), 'P', + OrePrefixes.plate.get(Materials.Polytetrafluoroethylene) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_LuV.get(1L), + GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextCableHull, 'M', ItemList.Casing_LuV, 'C', + OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H', + OrePrefixes.plate.get(Materials.Chrome), 'P', + OrePrefixes.plate.get(Materials.Polytetrafluoroethylene) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_ZPM.get(1L), + GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextCableHull, 'M', ItemList.Casing_ZPM, 'C', + OrePrefixes.cableGt02.get(Materials.Naquadah), 'H', OrePrefixes.plate.get(Materials.Iridium), + 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_UV.get(1L), + GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextCableHull, 'M', ItemList.Casing_UV, 'C', + OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 'H', + OrePrefixes.plate.get(Materials.Osmium), 'P', + OrePrefixes.plate.get(Materials.Polybenzimidazole) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hull_MAX.get(1L), + GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { aTextCableHull, 'M', ItemList.Casing_MAX, 'C', + OrePrefixes.wireGt04.get(Materials.SuperconductorUV), 'H', + OrePrefixes.plate.get(Materials.Neutronium), 'P', + OrePrefixes.plate.get(Materials.Polybenzimidazole) }); GT_ModHandler.removeRecipeByOutput(ItemList.Hull_ULV.get(1L)); GT_ModHandler.removeRecipeByOutput(ItemList.Hull_LV.get(1L)); @@ -821,379 +726,239 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_ModHandler.addCraftingRecipe( ItemList.Hull_ULV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - aTextCableHull, - 'M', - ItemList.Casing_ULV, - 'C', - OrePrefixes.cableGt01.get(Materials.Lead), - 'H', - OrePrefixes.plate.get(Materials.WroughtIron), - 'P', - OrePrefixes.plate.get(Materials.Wood) - }); + new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_ULV, 'C', + OrePrefixes.cableGt01.get(Materials.Lead), 'H', + OrePrefixes.plate.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.Wood) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_LV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - aTextCableHull, - 'M', - ItemList.Casing_LV, - 'C', - OrePrefixes.cableGt01.get(Materials.Tin), - 'H', - OrePrefixes.plate.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.WroughtIron) - }); + new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_LV, 'C', + OrePrefixes.cableGt01.get(Materials.Tin), 'H', OrePrefixes.plate.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.WroughtIron) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_MV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - aTextCableHull, - 'M', - ItemList.Casing_MV, - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'H', - OrePrefixes.plate.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.WroughtIron) - }); + new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_MV, 'C', + OrePrefixes.cableGt01.get(Materials.Copper), 'H', + OrePrefixes.plate.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.WroughtIron) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_HV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - aTextCableHull, - 'M', - ItemList.Casing_HV, - 'C', - OrePrefixes.cableGt01.get(Materials.Gold), - 'H', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.Plastic) - }); + new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_HV, 'C', + OrePrefixes.cableGt01.get(Materials.Gold), 'H', + OrePrefixes.plate.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.Plastic) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_EV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - aTextCableHull, - 'M', - ItemList.Casing_EV, - 'C', - OrePrefixes.cableGt01.get(Materials.Aluminium), - 'H', - OrePrefixes.plate.get(Materials.Titanium), - 'P', - OrePrefixes.plate.get(Materials.Plastic) - }); + new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_EV, 'C', + OrePrefixes.cableGt01.get(Materials.Aluminium), 'H', + OrePrefixes.plate.get(Materials.Titanium), 'P', OrePrefixes.plate.get(Materials.Plastic) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_IV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - aTextCableHull, - 'M', - ItemList.Casing_IV, - 'C', - OrePrefixes.cableGt01.get(Materials.Tungsten), - 'H', - OrePrefixes.plate.get(Materials.TungstenSteel), - 'P', - OrePrefixes.plate.get(Materials.Polytetrafluoroethylene) - }); + new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_IV, 'C', + OrePrefixes.cableGt01.get(Materials.Tungsten), 'H', + OrePrefixes.plate.get(Materials.TungstenSteel), 'P', + OrePrefixes.plate.get(Materials.Polytetrafluoroethylene) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_LuV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - aTextCableHull, - 'M', - ItemList.Casing_LuV, - 'C', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium), - 'H', - OrePrefixes.plate.get(Materials.Chrome), - 'P', - OrePrefixes.plate.get(Materials.Polytetrafluoroethylene) - }); + new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_LuV, 'C', + OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H', + OrePrefixes.plate.get(Materials.Chrome), 'P', + OrePrefixes.plate.get(Materials.Polytetrafluoroethylene) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_ZPM.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - aTextCableHull, - 'M', - ItemList.Casing_ZPM, - 'C', - OrePrefixes.cableGt01.get(Materials.Naquadah), - 'H', - OrePrefixes.plate.get(Materials.Iridium), - 'P', - OrePrefixes.plate.get(Materials.Polybenzimidazole) - }); + new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_ZPM, 'C', + OrePrefixes.cableGt01.get(Materials.Naquadah), 'H', + OrePrefixes.plate.get(Materials.Iridium), 'P', + OrePrefixes.plate.get(Materials.Polybenzimidazole) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_UV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - aTextCableHull, - 'M', - ItemList.Casing_UV, - 'C', - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), - 'H', - OrePrefixes.plate.get(Materials.Osmium), - 'P', - OrePrefixes.plate.get(Materials.Polybenzimidazole) - }); + new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_UV, 'C', + OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'H', + OrePrefixes.plate.get(Materials.Osmium), 'P', + OrePrefixes.plate.get(Materials.Polybenzimidazole) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_MAX.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - aTextCableHull, - 'M', - ItemList.Casing_MAX, - 'C', - OrePrefixes.wireGt04.get(Materials.SuperconductorUV), - 'H', - OrePrefixes.plate.get(Materials.Neutronium), - 'P', - OrePrefixes.plate.get(Materials.Polybenzimidazole) - }); + new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_MAX, 'C', + OrePrefixes.wireGt04.get(Materials.SuperconductorUV), 'H', + OrePrefixes.plate.get(Materials.Neutronium), 'P', + OrePrefixes.plate.get(Materials.Polybenzimidazole) }); } else { GT_ModHandler.addCraftingRecipe( ItemList.Hull_ULV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - aTextCableHull, 'M', ItemList.Casing_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead) - }); + new Object[] { aTextCableHull, 'M', ItemList.Casing_ULV, 'C', + OrePrefixes.cableGt01.get(Materials.Lead) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_LV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {aTextCableHull, 'M', ItemList.Casing_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin) - }); + new Object[] { aTextCableHull, 'M', ItemList.Casing_LV, 'C', + OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_MV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - aTextCableHull, 'M', ItemList.Casing_MV, 'C', OrePrefixes.cableGt01.get(Materials.Copper) - }); + new Object[] { aTextCableHull, 'M', ItemList.Casing_MV, 'C', + OrePrefixes.cableGt01.get(Materials.Copper) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_HV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - aTextCableHull, 'M', ItemList.Casing_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold) - }); + new Object[] { aTextCableHull, 'M', ItemList.Casing_HV, 'C', + OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_EV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - aTextCableHull, 'M', ItemList.Casing_EV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium) - }); + new Object[] { aTextCableHull, 'M', ItemList.Casing_EV, 'C', + OrePrefixes.cableGt01.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_IV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - aTextCableHull, 'M', ItemList.Casing_IV, 'C', OrePrefixes.cableGt01.get(Materials.Tungsten) - }); + new Object[] { aTextCableHull, 'M', ItemList.Casing_IV, 'C', + OrePrefixes.cableGt01.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_LuV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_LuV, - 'C', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium) - }); + new Object[] { aTextCableHull, 'M', ItemList.Casing_LuV, 'C', + OrePrefixes.cableGt01.get(Materials.VanadiumGallium) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_ZPM.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - aTextCableHull, 'M', ItemList.Casing_ZPM, 'C', OrePrefixes.cableGt01.get(Materials.Naquadah) - }); + new Object[] { aTextCableHull, 'M', ItemList.Casing_ZPM, 'C', + OrePrefixes.cableGt01.get(Materials.Naquadah) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_UV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - aTextCableHull, 'M', ItemList.Casing_UV, 'C', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy) - }); + new Object[] { aTextCableHull, 'M', ItemList.Casing_UV, 'C', + OrePrefixes.wireGt04.get(Materials.NaquadahAlloy) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_MAX.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - aTextCableHull, - 'M', - ItemList.Casing_MAX, - 'C', - OrePrefixes.wireGt04.get(Materials.SuperconductorUV) - }); + new Object[] { aTextCableHull, 'M', ItemList.Casing_MAX, 'C', + OrePrefixes.wireGt04.get(Materials.SuperconductorUV) }); } - ItemList.Transformer_LV_ULV.set(new GT_MetaTileEntity_Transformer( + ItemList.Transformer_LV_ULV.set( + new GT_MetaTileEntity_Transformer( 20, "transformer.tier.00", "Ultra Low Voltage Transformer", 0, - "LV -> ULV (Use Soft Mallet to invert)") - .getStackForm(1L)); - ItemList.Transformer_MV_LV.set(new GT_MetaTileEntity_Transformer( - 21, "transformer.tier.01", "Low Voltage Transformer", 1, "MV -> LV (Use Soft Mallet to invert)") - .getStackForm(1L)); - ItemList.Transformer_HV_MV.set(new GT_MetaTileEntity_Transformer( + "LV -> ULV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_MV_LV.set( + new GT_MetaTileEntity_Transformer( + 21, + "transformer.tier.01", + "Low Voltage Transformer", + 1, + "MV -> LV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_HV_MV.set( + new GT_MetaTileEntity_Transformer( 22, "transformer.tier.02", "Medium Voltage Transformer", 2, - "HV -> MV (Use Soft Mallet to invert)") - .getStackForm(1L)); - ItemList.Transformer_EV_HV.set(new GT_MetaTileEntity_Transformer( + "HV -> MV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_EV_HV.set( + new GT_MetaTileEntity_Transformer( 23, "transformer.tier.03", "High Voltage Transformer", 3, - "EV -> HV (Use Soft Mallet to invert)") - .getStackForm(1L)); - ItemList.Transformer_IV_EV.set(new GT_MetaTileEntity_Transformer( - 24, "transformer.tier.04", "Extreme Transformer", 4, "IV -> EV (Use Soft Mallet to invert)") - .getStackForm(1L)); - ItemList.Transformer_LuV_IV.set(new GT_MetaTileEntity_Transformer( - 25, "transformer.tier.05", "Insane Transformer", 5, "LuV -> IV (Use Soft Mallet to invert)") - .getStackForm(1L)); - ItemList.Transformer_ZPM_LuV.set(new GT_MetaTileEntity_Transformer( - 26, "transformer.tier.06", "Ludicrous Transformer", 6, "ZPM -> LuV (Use Soft Mallet to invert)") - .getStackForm(1L)); - ItemList.Transformer_UV_ZPM.set(new GT_MetaTileEntity_Transformer( + "EV -> HV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_IV_EV.set( + new GT_MetaTileEntity_Transformer( + 24, + "transformer.tier.04", + "Extreme Transformer", + 4, + "IV -> EV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_LuV_IV.set( + new GT_MetaTileEntity_Transformer( + 25, + "transformer.tier.05", + "Insane Transformer", + 5, + "LuV -> IV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_ZPM_LuV.set( + new GT_MetaTileEntity_Transformer( + 26, + "transformer.tier.06", + "Ludicrous Transformer", + 6, + "ZPM -> LuV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_UV_ZPM.set( + new GT_MetaTileEntity_Transformer( 27, "transformer.tier.07", "ZPM Voltage Transformer", 7, - "UV -> ZPM (Use Soft Mallet to invert)") - .getStackForm(1L)); - ItemList.Transformer_MAX_UV.set(new GT_MetaTileEntity_Transformer( - 28, "transformer.tier.08", "Ultimate Transformer", 8, "UHV -> UV (Use Soft Mallet to invert)") - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_LV_ULV.get(1L), bitsd, new Object[] { - " BB", - "CM ", - " BB", - 'M', - ItemList.Hull_ULV, - 'C', - OrePrefixes.cableGt01.get(Materials.Tin), - 'B', - OrePrefixes.cableGt01.get(Materials.Lead) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_MV_LV.get(1L), bitsd, new Object[] { - " BB", - "CM ", - " BB", - 'M', - ItemList.Hull_LV, - 'C', - OrePrefixes.cableGt01.get(Materials.AnyCopper), - 'B', - OrePrefixes.cableGt01.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_HV_MV.get(1L), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - 'M', - ItemList.Hull_MV, - 'C', - OrePrefixes.cableGt01.get(Materials.Gold), - 'B', - OrePrefixes.cableGt01.get(Materials.AnyCopper), - 'K', - ItemList.Circuit_Parts_Coil - }); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_EV_HV.get(1L), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - 'M', - ItemList.Hull_HV, - 'C', - OrePrefixes.cableGt01.get(Materials.Aluminium), - 'B', - OrePrefixes.cableGt01.get(Materials.Gold), - 'K', - ItemList.Circuit_Chip_ULPIC - }); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_IV_EV.get(1L), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - 'M', - ItemList.Hull_EV, - 'C', - OrePrefixes.cableGt01.get(Materials.Tungsten), - 'B', - OrePrefixes.cableGt01.get(Materials.Aluminium), - 'K', - ItemList.Circuit_Chip_LPIC - }); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_LuV_IV.get(1L), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - 'M', - ItemList.Hull_IV, - 'C', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium), - 'B', - OrePrefixes.cableGt01.get(Materials.Tungsten), - 'K', - ItemList.Circuit_Chip_PIC - }); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_ZPM_LuV.get(1L), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - 'M', - ItemList.Hull_LuV, - 'C', - OrePrefixes.cableGt01.get(Materials.Naquadah), - 'B', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium), - 'K', - ItemList.Circuit_Chip_HPIC - }); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_UV_ZPM.get(1L), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - 'M', - ItemList.Hull_ZPM, - 'C', - OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), - 'B', - OrePrefixes.cableGt01.get(Materials.Naquadah), - 'K', - ItemList.Circuit_Chip_UHPIC - }); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_MAX_UV.get(1L), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - 'M', - ItemList.Hull_UV, - 'C', - OrePrefixes.wireGt01.get(Materials.Bedrockium), - 'B', - OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), - 'K', - ItemList.Circuit_Chip_NPIC - }); + "UV -> ZPM (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_MAX_UV.set( + new GT_MetaTileEntity_Transformer( + 28, + "transformer.tier.08", + "Ultimate Transformer", + 8, + "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Transformer_LV_ULV.get(1L), + bitsd, + new Object[] { " BB", "CM ", " BB", 'M', ItemList.Hull_ULV, 'C', + OrePrefixes.cableGt01.get(Materials.Tin), 'B', OrePrefixes.cableGt01.get(Materials.Lead) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Transformer_MV_LV.get(1L), + bitsd, + new Object[] { " BB", "CM ", " BB", 'M', ItemList.Hull_LV, 'C', + OrePrefixes.cableGt01.get(Materials.AnyCopper), 'B', + OrePrefixes.cableGt01.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Transformer_HV_MV.get(1L), + bitsd, + new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_MV, 'C', + OrePrefixes.cableGt01.get(Materials.Gold), 'B', OrePrefixes.cableGt01.get(Materials.AnyCopper), + 'K', ItemList.Circuit_Parts_Coil }); + GT_ModHandler.addCraftingRecipe( + ItemList.Transformer_EV_HV.get(1L), + bitsd, + new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_HV, 'C', + OrePrefixes.cableGt01.get(Materials.Aluminium), 'B', OrePrefixes.cableGt01.get(Materials.Gold), + 'K', ItemList.Circuit_Chip_ULPIC }); + GT_ModHandler.addCraftingRecipe( + ItemList.Transformer_IV_EV.get(1L), + bitsd, + new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_EV, 'C', + OrePrefixes.cableGt01.get(Materials.Tungsten), 'B', + OrePrefixes.cableGt01.get(Materials.Aluminium), 'K', ItemList.Circuit_Chip_LPIC }); + GT_ModHandler.addCraftingRecipe( + ItemList.Transformer_LuV_IV.get(1L), + bitsd, + new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_IV, 'C', + OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'B', + OrePrefixes.cableGt01.get(Materials.Tungsten), 'K', ItemList.Circuit_Chip_PIC }); + GT_ModHandler.addCraftingRecipe( + ItemList.Transformer_ZPM_LuV.get(1L), + bitsd, + new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_LuV, 'C', + OrePrefixes.cableGt01.get(Materials.Naquadah), 'B', + OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'K', ItemList.Circuit_Chip_HPIC }); + GT_ModHandler.addCraftingRecipe( + ItemList.Transformer_UV_ZPM.get(1L), + bitsd, + new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_ZPM, 'C', + OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'B', + OrePrefixes.cableGt01.get(Materials.Naquadah), 'K', ItemList.Circuit_Chip_UHPIC }); + GT_ModHandler.addCraftingRecipe( + ItemList.Transformer_MAX_UV.get(1L), + bitsd, + new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_UV, 'C', + OrePrefixes.wireGt01.get(Materials.Bedrockium), 'B', + OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'K', ItemList.Circuit_Chip_NPIC }); ItemList.Hatch_Dynamo_ULV.set( new GT_MetaTileEntity_Hatch_Dynamo(30, "hatch.dynamo.tier.00", "ULV Dynamo Hatch", 0).getStackForm(1L)); @@ -1216,57 +981,25 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Hatch_Dynamo_MAX.set( new GT_MetaTileEntity_Hatch_Dynamo(39, "hatch.dynamo.tier.09", "UHV Dynamo Hatch", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Dynamo_ULV.get(1L), bitsd, new Object[] { - "XOL", - "SMP", - "XOL", - 'M', - ItemList.Hull_ULV, - 'S', - OrePrefixes.spring.get(Materials.Lead), - 'X', - OrePrefixes.circuit.get(Materials.Primitive), - 'O', - ItemList.ULV_Coil, - 'L', - OrePrefixes.cell.get(Materials.Lubricant), - 'P', - OrePrefixes.rotor.get(Materials.Lead) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Dynamo_LV.get(1L), bitsd, new Object[] { - "XOL", - "SMP", - "XOL", - 'M', - ItemList.Hull_LV, - 'S', - OrePrefixes.spring.get(Materials.Tin), - 'X', - OrePrefixes.circuit.get(Materials.Basic), - 'O', - ItemList.LV_Coil, - 'L', - OrePrefixes.cell.get(Materials.Lubricant), - 'P', - ItemList.Electric_Pump_LV - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Dynamo_MV.get(1L), bitsd, new Object[] { - "XOL", - "SMP", - "XOL", - 'M', - ItemList.Hull_MV, - 'S', - OrePrefixes.spring.get(Materials.Copper), - 'X', - ItemList.Circuit_Chip_ULPIC, - 'O', - ItemList.MV_Coil, - 'L', - OrePrefixes.cell.get(Materials.Lubricant), - 'P', - ItemList.Electric_Pump_MV - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Dynamo_ULV.get(1L), + bitsd, + new Object[] { "XOL", "SMP", "XOL", 'M', ItemList.Hull_ULV, 'S', OrePrefixes.spring.get(Materials.Lead), + 'X', OrePrefixes.circuit.get(Materials.Primitive), 'O', ItemList.ULV_Coil, 'L', + OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Dynamo_LV.get(1L), + bitsd, + new Object[] { "XOL", "SMP", "XOL", 'M', ItemList.Hull_LV, 'S', OrePrefixes.spring.get(Materials.Tin), + 'X', OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', + OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Dynamo_MV.get(1L), + bitsd, + new Object[] { "XOL", "SMP", "XOL", 'M', ItemList.Hull_MV, 'S', + OrePrefixes.spring.get(Materials.Copper), 'X', ItemList.Circuit_Chip_ULPIC, 'O', + ItemList.MV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', + ItemList.Electric_Pump_MV }); // 1234 ItemList.Hatch_Energy_ULV.set( new GT_MetaTileEntity_Hatch_Energy(40, "hatch.energy.tier.00", "ULV Energy Hatch", 0).getStackForm(1L)); @@ -1289,57 +1022,27 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Hatch_Energy_MAX.set( new GT_MetaTileEntity_Hatch_Energy(49, "hatch.energy.tier.09", "UHV Energy Hatch", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_ULV.get(1L), bitsd, new Object[] { - "COL", - "XMP", - "COL", - 'M', - ItemList.Hull_ULV, - 'C', - OrePrefixes.cableGt01.get(Materials.Lead), - 'X', - OrePrefixes.circuit.get(Materials.Primitive), - 'O', - ItemList.ULV_Coil, - 'L', - OrePrefixes.cell.get(Materials.Lubricant), - 'P', - OrePrefixes.rotor.get(Materials.Lead) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_LV.get(1L), bitsd, new Object[] { - "COL", - "XMP", - "COL", - 'M', - ItemList.Hull_LV, - 'C', - OrePrefixes.cableGt01.get(Materials.Tin), - 'X', - OrePrefixes.circuit.get(Materials.Basic), - 'O', - ItemList.LV_Coil, - 'L', - OrePrefixes.cell.get(Materials.Lubricant), - 'P', - ItemList.Electric_Pump_LV - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_MV.get(1L), bitsd, new Object[] { - "XOL", - "CMP", - "XOL", - 'M', - ItemList.Hull_MV, - 'C', - OrePrefixes.cableGt01.get(Materials.Copper), - 'X', - ItemList.Circuit_Chip_ULPIC, - 'O', - ItemList.MV_Coil, - 'L', - OrePrefixes.cell.get(Materials.Lubricant), - 'P', - ItemList.Electric_Pump_MV - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Energy_ULV.get(1L), + bitsd, + new Object[] { "COL", "XMP", "COL", 'M', ItemList.Hull_ULV, 'C', + OrePrefixes.cableGt01.get(Materials.Lead), 'X', OrePrefixes.circuit.get(Materials.Primitive), + 'O', ItemList.ULV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', + OrePrefixes.rotor.get(Materials.Lead) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Energy_LV.get(1L), + bitsd, + new Object[] { "COL", "XMP", "COL", 'M', ItemList.Hull_LV, 'C', + OrePrefixes.cableGt01.get(Materials.Tin), 'X', OrePrefixes.circuit.get(Materials.Basic), 'O', + ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', + ItemList.Electric_Pump_LV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Energy_MV.get(1L), + bitsd, + new Object[] { "XOL", "CMP", "XOL", 'M', ItemList.Hull_MV, 'C', + OrePrefixes.cableGt01.get(Materials.Copper), 'X', ItemList.Circuit_Chip_ULPIC, 'O', + ItemList.MV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', + ItemList.Electric_Pump_MV }); ItemList.Hatch_Input_ULV.set( new GT_MetaTileEntity_Hatch_Input(50, "hatch.input.tier.00", "Input Hatch (ULV)", 0).getStackForm(1L)); @@ -1361,30 +1064,62 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_Hatch_Input(58, "hatch.input.tier.08", "Input Hatch (UV)", 8).getStackForm(1L)); ItemList.Hatch_Input_MAX.set( new GT_MetaTileEntity_Hatch_Input(59, "hatch.input.tier.09", "Input Hatch (UHV)", 9).getStackForm(1L)); - ItemList.Hatch_Input_Multi_2x2_EV.set(new GT_MetaTileEntity_Hatch_MultiInput( - 200, 4, "hatch.multi.input.tier.01", "Quadruple Input Hatch (EV)", 4) - .getStackForm(1L)); - ItemList.Hatch_Input_Multi_2x2_IV.set(new GT_MetaTileEntity_Hatch_MultiInput( - 710, 4, "hatch.multi.input.tier.02", "Quadruple Input Hatch (IV)", 5) - .getStackForm(1L)); - ItemList.Hatch_Input_Multi_2x2_LuV.set(new GT_MetaTileEntity_Hatch_MultiInput( - 711, 4, "hatch.multi.input.tier.03", "Quadruple Input Hatch (LuV)", 6) - .getStackForm(1L)); - ItemList.Hatch_Input_Multi_2x2_ZPM.set(new GT_MetaTileEntity_Hatch_MultiInput( - 712, 4, "hatch.multi.input.tier.04", "Quadruple Input Hatch (ZPM)", 7) - .getStackForm(1L)); - ItemList.Hatch_Input_Multi_2x2_UV.set(new GT_MetaTileEntity_Hatch_MultiInput( - 713, 4, "hatch.multi.input.tier.05", "Quadruple Input Hatch (UV)", 8) - .getStackForm(1L)); - ItemList.Hatch_Input_Multi_2x2_UHV.set(new GT_MetaTileEntity_Hatch_MultiInput( - 714, 4, "hatch.multi.input.tier.06", "Quadruple Input Hatch (UHV)", 9) - .getStackForm(1L)); - ItemList.Hatch_Input_Multi_2x2_UEV.set(new GT_MetaTileEntity_Hatch_MultiInput( - 715, 4, "hatch.multi.input.tier.07", "Quadruple Input Hatch (UEV)", 10) - .getStackForm(1L)); - ItemList.Hatch_Input_Multi_2x2_UIV.set(new GT_MetaTileEntity_Hatch_MultiInput( - 716, 4, "hatch.multi.input.tier.08", "Quadruple Input Hatch (UIV)", 11) - .getStackForm(1L)); + ItemList.Hatch_Input_Multi_2x2_EV.set( + new GT_MetaTileEntity_Hatch_MultiInput( + 200, + 4, + "hatch.multi.input.tier.01", + "Quadruple Input Hatch (EV)", + 4).getStackForm(1L)); + ItemList.Hatch_Input_Multi_2x2_IV.set( + new GT_MetaTileEntity_Hatch_MultiInput( + 710, + 4, + "hatch.multi.input.tier.02", + "Quadruple Input Hatch (IV)", + 5).getStackForm(1L)); + ItemList.Hatch_Input_Multi_2x2_LuV.set( + new GT_MetaTileEntity_Hatch_MultiInput( + 711, + 4, + "hatch.multi.input.tier.03", + "Quadruple Input Hatch (LuV)", + 6).getStackForm(1L)); + ItemList.Hatch_Input_Multi_2x2_ZPM.set( + new GT_MetaTileEntity_Hatch_MultiInput( + 712, + 4, + "hatch.multi.input.tier.04", + "Quadruple Input Hatch (ZPM)", + 7).getStackForm(1L)); + ItemList.Hatch_Input_Multi_2x2_UV.set( + new GT_MetaTileEntity_Hatch_MultiInput( + 713, + 4, + "hatch.multi.input.tier.05", + "Quadruple Input Hatch (UV)", + 8).getStackForm(1L)); + ItemList.Hatch_Input_Multi_2x2_UHV.set( + new GT_MetaTileEntity_Hatch_MultiInput( + 714, + 4, + "hatch.multi.input.tier.06", + "Quadruple Input Hatch (UHV)", + 9).getStackForm(1L)); + ItemList.Hatch_Input_Multi_2x2_UEV.set( + new GT_MetaTileEntity_Hatch_MultiInput( + 715, + 4, + "hatch.multi.input.tier.07", + "Quadruple Input Hatch (UEV)", + 10).getStackForm(1L)); + ItemList.Hatch_Input_Multi_2x2_UIV.set( + new GT_MetaTileEntity_Hatch_MultiInput( + 716, + 4, + "hatch.multi.input.tier.08", + "Quadruple Input Hatch (UIV)", + 11).getStackForm(1L)); ItemList.Hatch_Output_ULV.set( new GT_MetaTileEntity_Hatch_Output(60, "hatch.output.tier.00", "Output Hatch (ULV)", 0) @@ -1444,38 +1179,47 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_QuantumChest(129, "quantum.chest.tier.10", "Quantum Chest V", 10) .getStackForm(1L)); - ItemList.Super_Tank_LV.set( - new GT_MetaTileEntity_SuperTank(130, "super.tank.tier.01", "Super Tank I", 1).getStackForm(1L)); - ItemList.Super_Tank_MV.set( - new GT_MetaTileEntity_SuperTank(131, "super.tank.tier.02", "Super Tank II", 2).getStackForm(1L)); - ItemList.Super_Tank_HV.set( - new GT_MetaTileEntity_SuperTank(132, "super.tank.tier.03", "Super Tank III", 3).getStackForm(1L)); - ItemList.Super_Tank_EV.set( - new GT_MetaTileEntity_SuperTank(133, "super.tank.tier.04", "Super Tank IV", 4).getStackForm(1L)); - ItemList.Super_Tank_IV.set( - new GT_MetaTileEntity_SuperTank(134, "super.tank.tier.05", "Super Tank V", 5).getStackForm(1L)); + ItemList.Super_Tank_LV + .set(new GT_MetaTileEntity_SuperTank(130, "super.tank.tier.01", "Super Tank I", 1).getStackForm(1L)); + ItemList.Super_Tank_MV + .set(new GT_MetaTileEntity_SuperTank(131, "super.tank.tier.02", "Super Tank II", 2).getStackForm(1L)); + ItemList.Super_Tank_HV + .set(new GT_MetaTileEntity_SuperTank(132, "super.tank.tier.03", "Super Tank III", 3).getStackForm(1L)); + ItemList.Super_Tank_EV + .set(new GT_MetaTileEntity_SuperTank(133, "super.tank.tier.04", "Super Tank IV", 4).getStackForm(1L)); + ItemList.Super_Tank_IV + .set(new GT_MetaTileEntity_SuperTank(134, "super.tank.tier.05", "Super Tank V", 5).getStackForm(1L)); - ItemList.Super_Chest_LV.set( - new GT_MetaTileEntity_SuperChest(135, "super.chest.tier.01", "Super Chest I", 1).getStackForm(1L)); + ItemList.Super_Chest_LV + .set(new GT_MetaTileEntity_SuperChest(135, "super.chest.tier.01", "Super Chest I", 1).getStackForm(1L)); ItemList.Super_Chest_MV.set( new GT_MetaTileEntity_SuperChest(136, "super.chest.tier.02", "Super Chest II", 2).getStackForm(1L)); ItemList.Super_Chest_HV.set( new GT_MetaTileEntity_SuperChest(137, "super.chest.tier.03", "Super Chest III", 3).getStackForm(1L)); ItemList.Super_Chest_EV.set( new GT_MetaTileEntity_SuperChest(138, "super.chest.tier.04", "Super Chest IV", 4).getStackForm(1L)); - ItemList.Super_Chest_IV.set( - new GT_MetaTileEntity_SuperChest(139, "super.chest.tier.05", "Super Chest V", 5).getStackForm(1L)); - - ItemList.Long_Distance_Pipeline_Fluid.set(new GT_MetaTileEntity_LongDistancePipelineFluid( - 2700, "long.distance.pipeline.fluid", "Long Distance Fluid Pipeline", 1) - .getStackForm(1L)); - ItemList.Long_Distance_Pipeline_Item.set(new GT_MetaTileEntity_LongDistancePipelineItem( - 2701, "long.distance.pipeline.item", "Long Distance Item Pipeline", 1) - .getStackForm(1L)); - - ItemList.AdvDebugStructureWriter.set(new GT_MetaTileEntity_AdvDebugStructureWriter( - 349, "advdebugstructurewriter", "Advanced Debug Structure Writer", 5) - .getStackForm(1L)); + ItemList.Super_Chest_IV + .set(new GT_MetaTileEntity_SuperChest(139, "super.chest.tier.05", "Super Chest V", 5).getStackForm(1L)); + + ItemList.Long_Distance_Pipeline_Fluid.set( + new GT_MetaTileEntity_LongDistancePipelineFluid( + 2700, + "long.distance.pipeline.fluid", + "Long Distance Fluid Pipeline", + 1).getStackForm(1L)); + ItemList.Long_Distance_Pipeline_Item.set( + new GT_MetaTileEntity_LongDistancePipelineItem( + 2701, + "long.distance.pipeline.item", + "Long Distance Item Pipeline", + 1).getStackForm(1L)); + + ItemList.AdvDebugStructureWriter.set( + new GT_MetaTileEntity_AdvDebugStructureWriter( + 349, + "advdebugstructurewriter", + "Advanced Debug Structure Writer", + 5).getStackForm(1L)); if (GregTech_API.mAE2) { ItemList.Hatch_Output_Bus_ME.set( @@ -1558,47 +1302,37 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC .getStackForm(1L)); GT_ModHandler.addCraftingRecipe( - ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] {"dwx", "hMc", "fsr", 'M', ItemList.Hull_LV}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { - "dwx", - "hMC", - "fsr", - 'M', - ItemList.Hull_LV, - 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar", 1L, 0) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { - "dwx", - "hMC", - "fsr", - 'M', - ItemList.Hull_LV, - 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar.reinforced", 1L, 0) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { - "dwx", - "hMC", - "fsr", - 'M', - ItemList.Hull_LV, - 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar.magic", 1L, 0) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { - "dwx", - "hMC", - "fsr", - 'M', - ItemList.Hull_LV, - 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar.void", 1L, 0) - }); - - ItemList.Hatch_AutoMaintenance.set(new GT_MetaTileEntity_Hatch_Maintenance( - 111, "hatch.maintenance.auto", "Auto Maintenance Hatch", 6, true) - .getStackForm(1L)); + ItemList.Hatch_Maintenance.get(1L), + bitsd, + new Object[] { "dwx", "hMc", "fsr", 'M', ItemList.Hull_LV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Maintenance.get(1L), + bitsd, + new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', + GT_ModHandler.getModItem("Railcraft", "tool.crowbar", 1L, 0) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Maintenance.get(1L), + bitsd, + new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', + GT_ModHandler.getModItem("Railcraft", "tool.crowbar.reinforced", 1L, 0) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Maintenance.get(1L), + bitsd, + new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', + GT_ModHandler.getModItem("Railcraft", "tool.crowbar.magic", 1L, 0) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Maintenance.get(1L), + bitsd, + new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', + GT_ModHandler.getModItem("Railcraft", "tool.crowbar.void", 1L, 0) }); + + ItemList.Hatch_AutoMaintenance.set( + new GT_MetaTileEntity_Hatch_Maintenance( + 111, + "hatch.maintenance.auto", + "Auto Maintenance Hatch", + 6, + true).getStackForm(1L)); ItemList.Hatch_DataAccess_EV.set( new GT_MetaTileEntity_Hatch_DataAccess(145, "hatch.dataaccess", "Data Access Hatch", 4) .getStackForm(1L)); @@ -1609,55 +1343,27 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_Hatch_DataAccess(147, "hatch.dataaccess.auto", "Automatable Data Access Hatch", 8) .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_DataAccess_EV.get(1L), bitsd, new Object[] { - "COC", - "OMO", - "COC", - 'M', - ItemList.Hull_EV, - 'O', - ItemList.Tool_DataStick, - 'C', - OrePrefixes.circuit.get(Materials.Elite) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_DataAccess_LuV.get(1L), bitsd, new Object[] { - "COC", - "OMO", - "COC", - 'M', - ItemList.Hull_LuV, - 'O', - ItemList.Tool_DataOrb, - 'C', - OrePrefixes.circuit.get(Materials.Ultimate) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_DataAccess_UV.get(1L), bitsd, new Object[] { - "CRC", - "OMO", - "CRC", - 'M', - ItemList.Hull_UV, - 'O', - ItemList.Tool_DataOrb, - 'C', - OrePrefixes.circuit.get(Materials.Infinite), - 'R', - ItemList.Robot_Arm_UV - }); - - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_AutoMaintenance.get(1L), bitsd, new Object[] { - "CHC", - "AMA", - "CHC", - 'M', - ItemList.Hull_LuV, - 'H', - ItemList.Hatch_Maintenance, - 'A', - ItemList.Robot_Arm_LuV, - 'C', - OrePrefixes.circuit.get(Materials.Ultimate) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_DataAccess_EV.get(1L), + bitsd, + new Object[] { "COC", "OMO", "COC", 'M', ItemList.Hull_EV, 'O', ItemList.Tool_DataStick, 'C', + OrePrefixes.circuit.get(Materials.Elite) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_DataAccess_LuV.get(1L), + bitsd, + new Object[] { "COC", "OMO", "COC", 'M', ItemList.Hull_LuV, 'O', ItemList.Tool_DataOrb, 'C', + OrePrefixes.circuit.get(Materials.Ultimate) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_DataAccess_UV.get(1L), + bitsd, + new Object[] { "CRC", "OMO", "CRC", 'M', ItemList.Hull_UV, 'O', ItemList.Tool_DataOrb, 'C', + OrePrefixes.circuit.get(Materials.Infinite), 'R', ItemList.Robot_Arm_UV }); + + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_AutoMaintenance.get(1L), + bitsd, + new Object[] { "CHC", "AMA", "CHC", 'M', ItemList.Hull_LuV, 'H', ItemList.Hatch_Maintenance, 'A', + ItemList.Robot_Arm_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate) }); ItemList.Hatch_Muffler_LV.set( new GT_MetaTileEntity_Hatch_Muffler(91, "hatch.muffler.tier.01", "Muffler Hatch (LV)", 1) @@ -1687,105 +1393,62 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_Hatch_Muffler(99, "hatch.muffler.tier.09", "Muffler Hatch (UHV)", 9) .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Muffler_LV.get(1L), bitsd, new Object[] { - "MX ", - "PR ", - 'M', - ItemList.Hull_LV, - 'P', - OrePrefixes.pipeMedium.get(Materials.Bronze), - 'R', - OrePrefixes.rotor.get(Materials.Bronze), - 'X', - ItemList.Electric_Motor_LV - }); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Muffler_MV.get(1L), bitsd, new Object[] { - "MX ", - "PR ", - 'M', - ItemList.Hull_MV, - 'P', - OrePrefixes.pipeMedium.get(Materials.Steel), - 'R', - OrePrefixes.rotor.get(Materials.Steel), - 'X', - ItemList.Electric_Motor_MV - }); - - ItemList.Machine_Bronze_Boiler.set( - new GT_MetaTileEntity_Boiler_Bronze(100, "boiler.bronze", "Small Coal Boiler").getStackForm(1L)); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Muffler_LV.get(1L), + bitsd, + new Object[] { "MX ", "PR ", 'M', ItemList.Hull_LV, 'P', OrePrefixes.pipeMedium.get(Materials.Bronze), + 'R', OrePrefixes.rotor.get(Materials.Bronze), 'X', ItemList.Electric_Motor_LV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Hatch_Muffler_MV.get(1L), + bitsd, + new Object[] { "MX ", "PR ", 'M', ItemList.Hull_MV, 'P', OrePrefixes.pipeMedium.get(Materials.Steel), + 'R', OrePrefixes.rotor.get(Materials.Steel), 'X', ItemList.Electric_Motor_MV }); + + ItemList.Machine_Bronze_Boiler + .set(new GT_MetaTileEntity_Boiler_Bronze(100, "boiler.bronze", "Small Coal Boiler").getStackForm(1L)); ItemList.Machine_Steel_Boiler.set( new GT_MetaTileEntity_Boiler_Steel(101, "boiler.steel", "High Pressure Coal Boiler").getStackForm(1L)); ItemList.Machine_Steel_Boiler_Lava.set( new GT_MetaTileEntity_Boiler_Lava(102, "boiler.lava", "High Pressure Lava Boiler").getStackForm(1L)); - ItemList.Machine_Bronze_Boiler_Solar.set( - new GT_MetaTileEntity_Boiler_Solar(105, "boiler.solar", "Simple Solar Boiler").getStackForm(1L)); + ItemList.Machine_Bronze_Boiler_Solar + .set(new GT_MetaTileEntity_Boiler_Solar(105, "boiler.solar", "Simple Solar Boiler").getStackForm(1L)); ItemList.Machine_HP_Solar.set( new GT_MetaTileEntity_Boiler_Solar_Steel(114, "boiler.steel.solar", "High Pressure Solar Boiler") .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Boiler.get(1L), bitsd, new Object[] { - aTextPlate, - "PwP", - "BFB", - 'F', - OreDictNames.craftingIronFurnace, - 'P', - OrePrefixes.plate.get(Materials.Bronze), - 'B', - new ItemStack(Blocks.brick_block, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Steel_Boiler.get(1L), bitsd, new Object[] { - aTextPlate, - "PwP", - "BFB", - 'F', - OreDictNames.craftingIronFurnace, - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'B', - new ItemStack(Blocks.brick_block, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Steel_Boiler_Lava.get(1L), bitsd, new Object[] { - aTextPlate, - "PTP", - aTextPlateMotor, - 'M', - ItemList.Hull_HP, - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'T', - GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1L, 0) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Boiler_Solar.get(1L), bitsd, new Object[] { - "GGG", - "SSS", - aTextPlateMotor, - 'M', - ItemList.Hull_Bronze_Bricks, - 'P', - OrePrefixes.pipeSmall.get(Materials.Bronze), - 'S', - OrePrefixes.plateDouble.get(Materials.Silver), - 'G', - new ItemStack(Blocks.glass, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Solar.get(1L), bitsd, new Object[] { - "GGG", - "SSS", - aTextPlateMotor, - 'M', - ItemList.Hull_HP_Bricks, - 'P', - OrePrefixes.pipeSmall.get(Materials.Steel), - 'S', - OrePrefixes.plateTriple.get(Materials.Silver), - 'G', - GT_ModHandler.getModItem("IC2", "blockAlloyGlass", 1L) - }); - - ItemList.Machine_Bronze_BlastFurnace.set(new GT_MetaTileEntity_BronzeBlastFurnace( - 108, "bronzemachine.blastfurnace", "Bronze Plated Blast Furnace") - .getStackForm(1L)); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Bronze_Boiler.get(1L), + bitsd, + new Object[] { aTextPlate, "PwP", "BFB", 'F', OreDictNames.craftingIronFurnace, 'P', + OrePrefixes.plate.get(Materials.Bronze), 'B', new ItemStack(Blocks.brick_block, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Steel_Boiler.get(1L), + bitsd, + new Object[] { aTextPlate, "PwP", "BFB", 'F', OreDictNames.craftingIronFurnace, 'P', + OrePrefixes.plate.get(Materials.Steel), 'B', new ItemStack(Blocks.brick_block, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Steel_Boiler_Lava.get(1L), + bitsd, + new Object[] { aTextPlate, "PTP", aTextPlateMotor, 'M', ItemList.Hull_HP, 'P', + OrePrefixes.plate.get(Materials.Steel), 'T', + GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1L, 0) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Bronze_Boiler_Solar.get(1L), + bitsd, + new Object[] { "GGG", "SSS", aTextPlateMotor, 'M', ItemList.Hull_Bronze_Bricks, 'P', + OrePrefixes.pipeSmall.get(Materials.Bronze), 'S', OrePrefixes.plateDouble.get(Materials.Silver), + 'G', new ItemStack(Blocks.glass, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HP_Solar.get(1L), + bitsd, + new Object[] { "GGG", "SSS", aTextPlateMotor, 'M', ItemList.Hull_HP_Bricks, 'P', + OrePrefixes.pipeSmall.get(Materials.Steel), 'S', OrePrefixes.plateTriple.get(Materials.Silver), + 'G', GT_ModHandler.getModItem("IC2", "blockAlloyGlass", 1L) }); + + ItemList.Machine_Bronze_BlastFurnace.set( + new GT_MetaTileEntity_BronzeBlastFurnace( + 108, + "bronzemachine.blastfurnace", + "Bronze Plated Blast Furnace").getStackForm(1L)); ItemList.Machine_Bronze_Furnace.set( new GT_MetaTileEntity_Furnace_Bronze(103, "bronzemachine.furnace", "Steam Furnace").getStackForm(1L)); ItemList.Machine_HP_Furnace.set( @@ -1822,1071 +1485,1002 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_AlloySmelter_Steel(119, "hpmachine.alloysmelter", "High Pressure Alloy Smelter") .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Furnace.get(1L), bitsd, new Object[] { - "XXX", - "XMX", - "XFX", - 'M', - ItemList.Hull_Bronze_Bricks, - 'X', - OrePrefixes.pipeSmall.get(Materials.Bronze), - 'F', - OreDictNames.craftingFurnace - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Furnace.get(1L), bitsd, new Object[] { - "XSX", - "PMP", - "XXX", - 'M', - ItemList.Machine_Bronze_Furnace, - 'X', - OrePrefixes.pipeSmall.get(Materials.WroughtIron), - 'P', - OrePrefixes.plate.get(Materials.WroughtIron), - 'S', - OrePrefixes.plate.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Macerator.get(1L), bitsd, new Object[] { - "DXD", - "XMX", - "PXP", - 'M', - ItemList.Hull_Bronze, - 'X', - OrePrefixes.pipeSmall.get(Materials.Bronze), - 'P', - OreDictNames.craftingPiston, - 'D', - OrePrefixes.gem.get(Materials.Diamond) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Macerator.get(1L), bitsd, new Object[] { - "PSP", - "XMX", - "PPP", - 'M', - ItemList.Machine_Bronze_Macerator, - 'X', - OrePrefixes.pipeSmall.get(Materials.WroughtIron), - 'P', - OrePrefixes.plate.get(Materials.WroughtIron), - 'S', - OrePrefixes.plate.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Extractor.get(1L), bitsd, new Object[] { - "XXX", - "PMG", - "XXX", - 'M', - ItemList.Hull_Bronze, - 'X', - OrePrefixes.pipeSmall.get(Materials.Bronze), - 'P', - OreDictNames.craftingPiston, - 'G', - new ItemStack(Blocks.glass, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Extractor.get(1L), bitsd, new Object[] { - "XSX", - "PMP", - "XXX", - 'M', - ItemList.Machine_Bronze_Extractor, - 'X', - OrePrefixes.pipeSmall.get(Materials.WroughtIron), - 'P', - OrePrefixes.plate.get(Materials.WroughtIron), - 'S', - OrePrefixes.plate.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Hammer.get(1L), bitsd, new Object[] { - "XPX", - "XMX", - "XAX", - 'M', - ItemList.Hull_Bronze, - 'X', - OrePrefixes.pipeSmall.get(Materials.Bronze), - 'P', - OreDictNames.craftingPiston, - 'A', - OreDictNames.craftingAnvil - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Hammer.get(1L), bitsd, new Object[] { - "PSP", - "XMX", - "PPP", - 'M', - ItemList.Machine_Bronze_Hammer, - 'X', - OrePrefixes.pipeSmall.get(Materials.WroughtIron), - 'P', - OrePrefixes.plate.get(Materials.WroughtIron), - 'S', - OrePrefixes.plate.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Compressor.get(1L), bitsd, new Object[] { - "XXX", - aTextPlateMotor, - "XXX", - 'M', - ItemList.Hull_Bronze, - 'X', - OrePrefixes.pipeSmall.get(Materials.Bronze), - 'P', - OreDictNames.craftingPiston - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Compressor.get(1L), bitsd, new Object[] { - "XSX", - "PMP", - "XXX", - 'M', - ItemList.Machine_Bronze_Compressor, - 'X', - OrePrefixes.pipeSmall.get(Materials.WroughtIron), - 'P', - OrePrefixes.plate.get(Materials.WroughtIron), - 'S', - OrePrefixes.plate.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_AlloySmelter.get(1L), bitsd, new Object[] { - "XXX", - "FMF", - "XXX", - 'M', - ItemList.Hull_Bronze_Bricks, - 'X', - OrePrefixes.pipeSmall.get(Materials.Bronze), - 'F', - OreDictNames.craftingFurnace - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_AlloySmelter.get(1L), bitsd, new Object[] { - "PSP", - "PMP", - "PXP", - 'M', - ItemList.Machine_Bronze_AlloySmelter, - 'X', - OrePrefixes.pipeSmall.get(Materials.WroughtIron), - 'P', - OrePrefixes.plate.get(Materials.WroughtIron), - 'S', - OrePrefixes.plate.get(Materials.Steel) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Bronze_Furnace.get(1L), + bitsd, + new Object[] { "XXX", "XMX", "XFX", 'M', ItemList.Hull_Bronze_Bricks, 'X', + OrePrefixes.pipeSmall.get(Materials.Bronze), 'F', OreDictNames.craftingFurnace }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HP_Furnace.get(1L), + bitsd, + new Object[] { "XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Furnace, 'X', + OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', + OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Bronze_Macerator.get(1L), + bitsd, + new Object[] { "DXD", "XMX", "PXP", 'M', ItemList.Hull_Bronze, 'X', + OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'D', + OrePrefixes.gem.get(Materials.Diamond) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HP_Macerator.get(1L), + bitsd, + new Object[] { "PSP", "XMX", "PPP", 'M', ItemList.Machine_Bronze_Macerator, 'X', + OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', + OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Bronze_Extractor.get(1L), + bitsd, + new Object[] { "XXX", "PMG", "XXX", 'M', ItemList.Hull_Bronze, 'X', + OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'G', + new ItemStack(Blocks.glass, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HP_Extractor.get(1L), + bitsd, + new Object[] { "XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Extractor, 'X', + OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', + OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Bronze_Hammer.get(1L), + bitsd, + new Object[] { "XPX", "XMX", "XAX", 'M', ItemList.Hull_Bronze, 'X', + OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'A', + OreDictNames.craftingAnvil }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HP_Hammer.get(1L), + bitsd, + new Object[] { "PSP", "XMX", "PPP", 'M', ItemList.Machine_Bronze_Hammer, 'X', + OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', + OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Bronze_Compressor.get(1L), + bitsd, + new Object[] { "XXX", aTextPlateMotor, "XXX", 'M', ItemList.Hull_Bronze, 'X', + OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HP_Compressor.get(1L), + bitsd, + new Object[] { "XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Compressor, 'X', + OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', + OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Bronze_AlloySmelter.get(1L), + bitsd, + new Object[] { "XXX", "FMF", "XXX", 'M', ItemList.Hull_Bronze_Bricks, 'X', + OrePrefixes.pipeSmall.get(Materials.Bronze), 'F', OreDictNames.craftingFurnace }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HP_AlloySmelter.get(1L), + bitsd, + new Object[] { "PSP", "PMP", "PXP", 'M', ItemList.Machine_Bronze_AlloySmelter, 'X', + OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', + OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel) }); ItemList.Locker_ULV.set( new GT_MetaTileEntity_Locker(150, "locker.tier.00", "Ultra Low Voltage Locker", 0).getStackForm(1L)); - ItemList.Locker_LV.set( - new GT_MetaTileEntity_Locker(151, "locker.tier.01", "Low Voltage Locker", 1).getStackForm(1L)); - ItemList.Locker_MV.set( - new GT_MetaTileEntity_Locker(152, "locker.tier.02", "Medium Voltage Locker", 2).getStackForm(1L)); - ItemList.Locker_HV.set( - new GT_MetaTileEntity_Locker(153, "locker.tier.03", "High Voltage Locker", 3).getStackForm(1L)); - ItemList.Locker_EV.set( - new GT_MetaTileEntity_Locker(154, "locker.tier.04", "Extreme Voltage Locker", 4).getStackForm(1L)); - ItemList.Locker_IV.set( - new GT_MetaTileEntity_Locker(155, "locker.tier.05", "Insane Voltage Locker", 5).getStackForm(1L)); + ItemList.Locker_LV + .set(new GT_MetaTileEntity_Locker(151, "locker.tier.01", "Low Voltage Locker", 1).getStackForm(1L)); + ItemList.Locker_MV + .set(new GT_MetaTileEntity_Locker(152, "locker.tier.02", "Medium Voltage Locker", 2).getStackForm(1L)); + ItemList.Locker_HV + .set(new GT_MetaTileEntity_Locker(153, "locker.tier.03", "High Voltage Locker", 3).getStackForm(1L)); + ItemList.Locker_EV + .set(new GT_MetaTileEntity_Locker(154, "locker.tier.04", "Extreme Voltage Locker", 4).getStackForm(1L)); + ItemList.Locker_IV + .set(new GT_MetaTileEntity_Locker(155, "locker.tier.05", "Insane Voltage Locker", 5).getStackForm(1L)); ItemList.Locker_LuV.set( new GT_MetaTileEntity_Locker(156, "locker.tier.06", "Ludicrous Voltage Locker", 6).getStackForm(1L)); - ItemList.Locker_ZPM.set( - new GT_MetaTileEntity_Locker(157, "locker.tier.07", "ZPM Voltage Locker", 7).getStackForm(1L)); + ItemList.Locker_ZPM + .set(new GT_MetaTileEntity_Locker(157, "locker.tier.07", "ZPM Voltage Locker", 7).getStackForm(1L)); ItemList.Locker_UV.set( new GT_MetaTileEntity_Locker(158, "locker.tier.08", "Ultimate Voltage Locker", 8).getStackForm(1L)); - ItemList.Locker_MAX.set(new GT_MetaTileEntity_Locker(159, "locker.tier.09", "Highly Ultimate Voltage Locker", 9) - .getStackForm(1L)); - - ItemList.Battery_Buffer_1by1_ULV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 160, "batterybuffer.01.tier.00", "Ultra Low Voltage Battery Buffer", 0, "", 1) - .getStackForm(1L)); - ItemList.Battery_Buffer_1by1_LV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 161, "batterybuffer.01.tier.01", "Low Voltage Battery Buffer", 1, "", 1) - .getStackForm(1L)); - ItemList.Battery_Buffer_1by1_MV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 162, "batterybuffer.01.tier.02", "Medium Voltage Battery Buffer", 2, "", 1) - .getStackForm(1L)); - ItemList.Battery_Buffer_1by1_HV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 163, "batterybuffer.01.tier.03", "High Voltage Battery Buffer", 3, "", 1) - .getStackForm(1L)); - ItemList.Battery_Buffer_1by1_EV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 164, "batterybuffer.01.tier.04", "Extreme Voltage Battery Buffer", 4, "", 1) - .getStackForm(1L)); - ItemList.Battery_Buffer_1by1_IV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 165, "batterybuffer.01.tier.05", "Insane Voltage Battery Buffer", 5, "", 1) - .getStackForm(1L)); - ItemList.Battery_Buffer_1by1_LuV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 166, "batterybuffer.01.tier.06", "Ludicrous Voltage Battery Buffer", 6, "", 1) - .getStackForm(1L)); - ItemList.Battery_Buffer_1by1_ZPM.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 167, "batterybuffer.01.tier.07", "ZPM Voltage Battery Buffer", 7, "", 1) - .getStackForm(1L)); - ItemList.Battery_Buffer_1by1_UV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 168, "batterybuffer.01.tier.08", "Ultimate Voltage Battery Buffer", 8, "", 1) - .getStackForm(1L)); - ItemList.Battery_Buffer_1by1_MAX.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 169, "batterybuffer.01.tier.09", "Highly Ultimate Voltage Battery Buffer", 9, "", 1) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_ULV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_ULV, - 'W', - OrePrefixes.wireGt01.get(Materials.Lead), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_LV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_LV, - 'W', - OrePrefixes.wireGt01.get(Materials.Tin), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_MV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_MV, - 'W', - OrePrefixes.wireGt01.get(Materials.AnyCopper), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_HV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_HV, - 'W', - OrePrefixes.wireGt01.get(Materials.Gold), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_EV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_EV, - 'W', - OrePrefixes.wireGt01.get(Materials.Aluminium), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_IV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_IV, - 'W', - OrePrefixes.wireGt01.get(Materials.Tungsten), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_LuV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_LuV, - 'W', - OrePrefixes.wireGt01.get(Materials.VanadiumGallium), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_ZPM.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_ZPM, - 'W', - OrePrefixes.wireGt01.get(Materials.Naquadah), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_UV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_UV, - 'W', - OrePrefixes.wireGt01.get(Materials.NaquadahAlloy), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_MAX.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_MAX, - 'W', - OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - 'T', - OreDictNames.craftingChest - }); - - ItemList.Battery_Buffer_2by2_ULV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 170, "batterybuffer.04.tier.00", "Ultra Low Voltage Battery Buffer", 0, "", 4) - .getStackForm(1L)); - ItemList.Battery_Buffer_2by2_LV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 171, "batterybuffer.04.tier.01", "Low Voltage Battery Buffer", 1, "", 4) - .getStackForm(1L)); - ItemList.Battery_Buffer_2by2_MV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 172, "batterybuffer.04.tier.02", "Medium Voltage Battery Buffer", 2, "", 4) - .getStackForm(1L)); - ItemList.Battery_Buffer_2by2_HV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 173, "batterybuffer.04.tier.03", "High Voltage Battery Buffer", 3, "", 4) - .getStackForm(1L)); - ItemList.Battery_Buffer_2by2_EV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 174, "batterybuffer.04.tier.04", "Extreme Voltage Battery Buffer", 4, "", 4) - .getStackForm(1L)); - ItemList.Battery_Buffer_2by2_IV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 175, "batterybuffer.04.tier.05", "Insane Voltage Battery Buffer", 5, "", 4) - .getStackForm(1L)); - ItemList.Battery_Buffer_2by2_LuV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 176, "batterybuffer.04.tier.06", "Ludicrous Voltage Battery Buffer", 6, "", 4) - .getStackForm(1L)); - ItemList.Battery_Buffer_2by2_ZPM.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 177, "batterybuffer.04.tier.07", "ZPM Voltage Battery Buffer", 7, "", 4) - .getStackForm(1L)); - ItemList.Battery_Buffer_2by2_UV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 178, "batterybuffer.04.tier.08", "Ultimate Voltage Battery Buffer", 8, "", 4) - .getStackForm(1L)); - ItemList.Battery_Buffer_2by2_MAX.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 179, "batterybuffer.04.tier.09", "Highly Ultimate Voltage Battery Buffer", 9, "", 4) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_ULV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_ULV, - 'W', - OrePrefixes.wireGt04.get(Materials.Lead), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_LV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_LV, - 'W', - OrePrefixes.wireGt04.get(Materials.Tin), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_MV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_MV, - 'W', - OrePrefixes.wireGt04.get(Materials.AnyCopper), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_HV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_HV, - 'W', - OrePrefixes.wireGt04.get(Materials.Gold), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_EV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_EV, - 'W', - OrePrefixes.wireGt04.get(Materials.Aluminium), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_IV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_IV, - 'W', - OrePrefixes.wireGt04.get(Materials.Tungsten), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_LuV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_LuV, - 'W', - OrePrefixes.wireGt04.get(Materials.VanadiumGallium), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_ZPM.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_ZPM, - 'W', - OrePrefixes.wireGt04.get(Materials.Naquadah), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_UV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_UV, - 'W', - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_MAX.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_MAX, - 'W', - OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - 'T', - OreDictNames.craftingChest - }); - - ItemList.Battery_Buffer_3by3_ULV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 180, "batterybuffer.09.tier.00", "Ultra Low Voltage Battery Buffer", 0, "", 9) - .getStackForm(1L)); - ItemList.Battery_Buffer_3by3_LV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 181, "batterybuffer.09.tier.01", "Low Voltage Battery Buffer", 1, "", 9) - .getStackForm(1L)); - ItemList.Battery_Buffer_3by3_MV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 182, "batterybuffer.09.tier.02", "Medium Voltage Battery Buffer", 2, "", 9) - .getStackForm(1L)); - ItemList.Battery_Buffer_3by3_HV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 183, "batterybuffer.09.tier.03", "High Voltage Battery Buffer", 3, "", 9) - .getStackForm(1L)); - ItemList.Battery_Buffer_3by3_EV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 184, "batterybuffer.09.tier.04", "Extreme Voltage Battery Buffer", 4, "", 9) - .getStackForm(1L)); - ItemList.Battery_Buffer_3by3_IV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 185, "batterybuffer.09.tier.05", "Insane Voltage Battery Buffer", 5, "", 9) - .getStackForm(1L)); - ItemList.Battery_Buffer_3by3_LuV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 186, "batterybuffer.09.tier.06", "Ludicrous Voltage Battery Buffer", 6, "", 9) - .getStackForm(1L)); - ItemList.Battery_Buffer_3by3_ZPM.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 187, "batterybuffer.09.tier.07", "ZPM Voltage Battery Buffer", 7, "", 9) - .getStackForm(1L)); - ItemList.Battery_Buffer_3by3_UV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 188, "batterybuffer.09.tier.08", "Ultimate Voltage Battery Buffer", 8, "", 9) - .getStackForm(1L)); - ItemList.Battery_Buffer_3by3_MAX.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 189, "batterybuffer.09.tier.09", "Highly Ultimate Voltage Battery Buffer", 9, "", 9) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_ULV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_ULV, - 'W', - OrePrefixes.wireGt08.get(Materials.Lead), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_LV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_LV, - 'W', - OrePrefixes.wireGt08.get(Materials.Tin), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_MV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_MV, - 'W', - OrePrefixes.wireGt08.get(Materials.AnyCopper), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_HV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_HV, - 'W', - OrePrefixes.wireGt08.get(Materials.Gold), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_EV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_EV, - 'W', - OrePrefixes.wireGt08.get(Materials.Aluminium), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_IV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_IV, - 'W', - OrePrefixes.wireGt08.get(Materials.Tungsten), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_LuV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_LuV, - 'W', - OrePrefixes.wireGt08.get(Materials.VanadiumGallium), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_ZPM.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_ZPM, - 'W', - OrePrefixes.wireGt08.get(Materials.Naquadah), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_UV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_UV, - 'W', - OrePrefixes.wireGt08.get(Materials.NaquadahAlloy), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_MAX.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_MAX, - 'W', - OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), - 'T', - OreDictNames.craftingChest - }); - - ItemList.Battery_Buffer_4by4_ULV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 190, "batterybuffer.16.tier.00", "Ultra Low Voltage Battery Buffer", 0, "", 16) - .getStackForm(1L)); - ItemList.Battery_Buffer_4by4_LV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 191, "batterybuffer.16.tier.01", "Low Voltage Battery Buffer", 1, "", 16) - .getStackForm(1L)); - ItemList.Battery_Buffer_4by4_MV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 192, "batterybuffer.16.tier.02", "Medium Voltage Battery Buffer", 2, "", 16) - .getStackForm(1L)); - ItemList.Battery_Buffer_4by4_HV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 193, "batterybuffer.16.tier.03", "High Voltage Battery Buffer", 3, "", 16) - .getStackForm(1L)); - ItemList.Battery_Buffer_4by4_EV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 194, "batterybuffer.16.tier.04", "Extreme Voltage Battery Buffer", 4, "", 16) - .getStackForm(1L)); - ItemList.Battery_Buffer_4by4_IV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 195, "batterybuffer.16.tier.05", "Insane Voltage Battery Buffer", 5, "", 16) - .getStackForm(1L)); - ItemList.Battery_Buffer_4by4_LuV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 196, "batterybuffer.16.tier.06", "Ludicrous Voltage Battery Buffer", 6, "", 16) - .getStackForm(1L)); - ItemList.Battery_Buffer_4by4_ZPM.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 197, "batterybuffer.16.tier.07", "ZPM Voltage Battery Buffer", 7, "", 16) - .getStackForm(1L)); - ItemList.Battery_Buffer_4by4_UV.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 198, "batterybuffer.16.tier.08", "Ultimate Voltage Battery Buffer", 8, "", 16) - .getStackForm(1L)); - ItemList.Battery_Buffer_4by4_MAX.set(new GT_MetaTileEntity_BasicBatteryBuffer( - 199, "batterybuffer.16.tier.09", "Highly Ultimate Voltage Battery Buffer", 9, "", 16) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_ULV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_ULV, - 'W', - OrePrefixes.wireGt16.get(Materials.Lead), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_LV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_LV, - 'W', - OrePrefixes.wireGt16.get(Materials.Tin), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_MV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_MV, - 'W', - OrePrefixes.wireGt16.get(Materials.AnyCopper), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_HV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_HV, - 'W', - OrePrefixes.wireGt16.get(Materials.Gold), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_EV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_EV, - 'W', - OrePrefixes.wireGt16.get(Materials.Aluminium), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_IV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_IV, - 'W', - OrePrefixes.wireGt16.get(Materials.Tungsten), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_LuV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_LuV, - 'W', - OrePrefixes.wireGt16.get(Materials.VanadiumGallium), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_ZPM.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_ZPM, - 'W', - OrePrefixes.wireGt16.get(Materials.Naquadah), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_UV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_UV, - 'W', - OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), - 'T', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_MAX.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - 'M', - ItemList.Hull_MAX, - 'W', - OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), - 'T', - OreDictNames.craftingChest - }); - - ItemList.Battery_Charger_4by4_ULV.set(new GT_MetaTileEntity_Charger( + ItemList.Locker_MAX.set( + new GT_MetaTileEntity_Locker(159, "locker.tier.09", "Highly Ultimate Voltage Locker", 9) + .getStackForm(1L)); + + ItemList.Battery_Buffer_1by1_ULV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 160, + "batterybuffer.01.tier.00", + "Ultra Low Voltage Battery Buffer", + 0, + "", + 1).getStackForm(1L)); + ItemList.Battery_Buffer_1by1_LV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 161, + "batterybuffer.01.tier.01", + "Low Voltage Battery Buffer", + 1, + "", + 1).getStackForm(1L)); + ItemList.Battery_Buffer_1by1_MV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 162, + "batterybuffer.01.tier.02", + "Medium Voltage Battery Buffer", + 2, + "", + 1).getStackForm(1L)); + ItemList.Battery_Buffer_1by1_HV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 163, + "batterybuffer.01.tier.03", + "High Voltage Battery Buffer", + 3, + "", + 1).getStackForm(1L)); + ItemList.Battery_Buffer_1by1_EV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 164, + "batterybuffer.01.tier.04", + "Extreme Voltage Battery Buffer", + 4, + "", + 1).getStackForm(1L)); + ItemList.Battery_Buffer_1by1_IV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 165, + "batterybuffer.01.tier.05", + "Insane Voltage Battery Buffer", + 5, + "", + 1).getStackForm(1L)); + ItemList.Battery_Buffer_1by1_LuV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 166, + "batterybuffer.01.tier.06", + "Ludicrous Voltage Battery Buffer", + 6, + "", + 1).getStackForm(1L)); + ItemList.Battery_Buffer_1by1_ZPM.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 167, + "batterybuffer.01.tier.07", + "ZPM Voltage Battery Buffer", + 7, + "", + 1).getStackForm(1L)); + ItemList.Battery_Buffer_1by1_UV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 168, + "batterybuffer.01.tier.08", + "Ultimate Voltage Battery Buffer", + 8, + "", + 1).getStackForm(1L)); + ItemList.Battery_Buffer_1by1_MAX.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 169, + "batterybuffer.01.tier.09", + "Highly Ultimate Voltage Battery Buffer", + 9, + "", + 1).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_1by1_ULV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', + OrePrefixes.wireGt01.get(Materials.Lead), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_1by1_LV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', + OrePrefixes.wireGt01.get(Materials.Tin), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_1by1_MV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', + OrePrefixes.wireGt01.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_1by1_HV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', + OrePrefixes.wireGt01.get(Materials.Gold), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_1by1_EV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', + OrePrefixes.wireGt01.get(Materials.Aluminium), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_1by1_IV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', + OrePrefixes.wireGt01.get(Materials.Tungsten), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_1by1_LuV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', + OrePrefixes.wireGt01.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_1by1_ZPM.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', + OrePrefixes.wireGt01.get(Materials.Naquadah), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_1by1_UV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', + OrePrefixes.wireGt01.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_1by1_MAX.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', + OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); + + ItemList.Battery_Buffer_2by2_ULV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 170, + "batterybuffer.04.tier.00", + "Ultra Low Voltage Battery Buffer", + 0, + "", + 4).getStackForm(1L)); + ItemList.Battery_Buffer_2by2_LV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 171, + "batterybuffer.04.tier.01", + "Low Voltage Battery Buffer", + 1, + "", + 4).getStackForm(1L)); + ItemList.Battery_Buffer_2by2_MV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 172, + "batterybuffer.04.tier.02", + "Medium Voltage Battery Buffer", + 2, + "", + 4).getStackForm(1L)); + ItemList.Battery_Buffer_2by2_HV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 173, + "batterybuffer.04.tier.03", + "High Voltage Battery Buffer", + 3, + "", + 4).getStackForm(1L)); + ItemList.Battery_Buffer_2by2_EV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 174, + "batterybuffer.04.tier.04", + "Extreme Voltage Battery Buffer", + 4, + "", + 4).getStackForm(1L)); + ItemList.Battery_Buffer_2by2_IV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 175, + "batterybuffer.04.tier.05", + "Insane Voltage Battery Buffer", + 5, + "", + 4).getStackForm(1L)); + ItemList.Battery_Buffer_2by2_LuV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 176, + "batterybuffer.04.tier.06", + "Ludicrous Voltage Battery Buffer", + 6, + "", + 4).getStackForm(1L)); + ItemList.Battery_Buffer_2by2_ZPM.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 177, + "batterybuffer.04.tier.07", + "ZPM Voltage Battery Buffer", + 7, + "", + 4).getStackForm(1L)); + ItemList.Battery_Buffer_2by2_UV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 178, + "batterybuffer.04.tier.08", + "Ultimate Voltage Battery Buffer", + 8, + "", + 4).getStackForm(1L)); + ItemList.Battery_Buffer_2by2_MAX.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 179, + "batterybuffer.04.tier.09", + "Highly Ultimate Voltage Battery Buffer", + 9, + "", + 4).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_2by2_ULV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', + OrePrefixes.wireGt04.get(Materials.Lead), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_2by2_LV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', + OrePrefixes.wireGt04.get(Materials.Tin), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_2by2_MV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', + OrePrefixes.wireGt04.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_2by2_HV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', + OrePrefixes.wireGt04.get(Materials.Gold), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_2by2_EV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', + OrePrefixes.wireGt04.get(Materials.Aluminium), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_2by2_IV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', + OrePrefixes.wireGt04.get(Materials.Tungsten), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_2by2_LuV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', + OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_2by2_ZPM.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', + OrePrefixes.wireGt04.get(Materials.Naquadah), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_2by2_UV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', + OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_2by2_MAX.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', + OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); + + ItemList.Battery_Buffer_3by3_ULV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 180, + "batterybuffer.09.tier.00", + "Ultra Low Voltage Battery Buffer", + 0, + "", + 9).getStackForm(1L)); + ItemList.Battery_Buffer_3by3_LV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 181, + "batterybuffer.09.tier.01", + "Low Voltage Battery Buffer", + 1, + "", + 9).getStackForm(1L)); + ItemList.Battery_Buffer_3by3_MV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 182, + "batterybuffer.09.tier.02", + "Medium Voltage Battery Buffer", + 2, + "", + 9).getStackForm(1L)); + ItemList.Battery_Buffer_3by3_HV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 183, + "batterybuffer.09.tier.03", + "High Voltage Battery Buffer", + 3, + "", + 9).getStackForm(1L)); + ItemList.Battery_Buffer_3by3_EV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 184, + "batterybuffer.09.tier.04", + "Extreme Voltage Battery Buffer", + 4, + "", + 9).getStackForm(1L)); + ItemList.Battery_Buffer_3by3_IV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 185, + "batterybuffer.09.tier.05", + "Insane Voltage Battery Buffer", + 5, + "", + 9).getStackForm(1L)); + ItemList.Battery_Buffer_3by3_LuV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 186, + "batterybuffer.09.tier.06", + "Ludicrous Voltage Battery Buffer", + 6, + "", + 9).getStackForm(1L)); + ItemList.Battery_Buffer_3by3_ZPM.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 187, + "batterybuffer.09.tier.07", + "ZPM Voltage Battery Buffer", + 7, + "", + 9).getStackForm(1L)); + ItemList.Battery_Buffer_3by3_UV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 188, + "batterybuffer.09.tier.08", + "Ultimate Voltage Battery Buffer", + 8, + "", + 9).getStackForm(1L)); + ItemList.Battery_Buffer_3by3_MAX.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 189, + "batterybuffer.09.tier.09", + "Highly Ultimate Voltage Battery Buffer", + 9, + "", + 9).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_3by3_ULV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', + OrePrefixes.wireGt08.get(Materials.Lead), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_3by3_LV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', + OrePrefixes.wireGt08.get(Materials.Tin), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_3by3_MV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', + OrePrefixes.wireGt08.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_3by3_HV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', + OrePrefixes.wireGt08.get(Materials.Gold), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_3by3_EV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', + OrePrefixes.wireGt08.get(Materials.Aluminium), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_3by3_IV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', + OrePrefixes.wireGt08.get(Materials.Tungsten), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_3by3_LuV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', + OrePrefixes.wireGt08.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_3by3_ZPM.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', + OrePrefixes.wireGt08.get(Materials.Naquadah), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_3by3_UV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', + OrePrefixes.wireGt08.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_3by3_MAX.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', + OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); + + ItemList.Battery_Buffer_4by4_ULV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 190, + "batterybuffer.16.tier.00", + "Ultra Low Voltage Battery Buffer", + 0, + "", + 16).getStackForm(1L)); + ItemList.Battery_Buffer_4by4_LV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 191, + "batterybuffer.16.tier.01", + "Low Voltage Battery Buffer", + 1, + "", + 16).getStackForm(1L)); + ItemList.Battery_Buffer_4by4_MV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 192, + "batterybuffer.16.tier.02", + "Medium Voltage Battery Buffer", + 2, + "", + 16).getStackForm(1L)); + ItemList.Battery_Buffer_4by4_HV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 193, + "batterybuffer.16.tier.03", + "High Voltage Battery Buffer", + 3, + "", + 16).getStackForm(1L)); + ItemList.Battery_Buffer_4by4_EV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 194, + "batterybuffer.16.tier.04", + "Extreme Voltage Battery Buffer", + 4, + "", + 16).getStackForm(1L)); + ItemList.Battery_Buffer_4by4_IV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 195, + "batterybuffer.16.tier.05", + "Insane Voltage Battery Buffer", + 5, + "", + 16).getStackForm(1L)); + ItemList.Battery_Buffer_4by4_LuV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 196, + "batterybuffer.16.tier.06", + "Ludicrous Voltage Battery Buffer", + 6, + "", + 16).getStackForm(1L)); + ItemList.Battery_Buffer_4by4_ZPM.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 197, + "batterybuffer.16.tier.07", + "ZPM Voltage Battery Buffer", + 7, + "", + 16).getStackForm(1L)); + ItemList.Battery_Buffer_4by4_UV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 198, + "batterybuffer.16.tier.08", + "Ultimate Voltage Battery Buffer", + 8, + "", + 16).getStackForm(1L)); + ItemList.Battery_Buffer_4by4_MAX.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + 199, + "batterybuffer.16.tier.09", + "Highly Ultimate Voltage Battery Buffer", + 9, + "", + 16).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_4by4_ULV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', + OrePrefixes.wireGt16.get(Materials.Lead), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_4by4_LV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', + OrePrefixes.wireGt16.get(Materials.Tin), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_4by4_MV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', + OrePrefixes.wireGt16.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_4by4_HV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', + OrePrefixes.wireGt16.get(Materials.Gold), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_4by4_EV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', + OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_4by4_IV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', + OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_4by4_LuV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', + OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_4by4_ZPM.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', + OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_4by4_UV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', + OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Buffer_4by4_MAX.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', + OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); + + ItemList.Battery_Charger_4by4_ULV.set( + new GT_MetaTileEntity_Charger( 690, "batterycharger.16.tier.00", "Ultra Low Voltage Battery Charger", 0, "Each battery gives 8A in/4A out (min 4A/2A)", - 4) - .getStackForm(1L)); - ItemList.Battery_Charger_4by4_LV.set(new GT_MetaTileEntity_Charger( + 4).getStackForm(1L)); + ItemList.Battery_Charger_4by4_LV.set( + new GT_MetaTileEntity_Charger( 691, "batterycharger.16.tier.01", "Low Voltage Battery Charger", 1, "Each battery gives 8A in/4A out (min 4A/2A)", - 4) - .getStackForm(1L)); - ItemList.Battery_Charger_4by4_MV.set(new GT_MetaTileEntity_Charger( + 4).getStackForm(1L)); + ItemList.Battery_Charger_4by4_MV.set( + new GT_MetaTileEntity_Charger( 692, "batterycharger.16.tier.02", "Medium Voltage Battery Charger", 2, "Each battery gives 8A in/4A out (min 4A/2A)", - 4) - .getStackForm(1L)); - ItemList.Battery_Charger_4by4_HV.set(new GT_MetaTileEntity_Charger( + 4).getStackForm(1L)); + ItemList.Battery_Charger_4by4_HV.set( + new GT_MetaTileEntity_Charger( 693, "batterycharger.16.tier.03", "High Voltage Battery Charger", 3, "Each battery gives 8A in/4A out (min 4A/2A)", - 4) - .getStackForm(1L)); - ItemList.Battery_Charger_4by4_EV.set(new GT_MetaTileEntity_Charger( + 4).getStackForm(1L)); + ItemList.Battery_Charger_4by4_EV.set( + new GT_MetaTileEntity_Charger( 694, "batterycharger.16.tier.04", "Extreme Voltage Battery Charger", 4, "Each battery gives 8A in/4A out (min 4A/2A)", - 4) - .getStackForm(1L)); - ItemList.Battery_Charger_4by4_IV.set(new GT_MetaTileEntity_Charger( + 4).getStackForm(1L)); + ItemList.Battery_Charger_4by4_IV.set( + new GT_MetaTileEntity_Charger( 695, "batterycharger.16.tier.05", "Insane Voltage Battery Charger", 5, "Each battery gives 8A in/4A out (min 4A/2A)", - 4) - .getStackForm(1L)); - ItemList.Battery_Charger_4by4_LuV.set(new GT_MetaTileEntity_Charger( + 4).getStackForm(1L)); + ItemList.Battery_Charger_4by4_LuV.set( + new GT_MetaTileEntity_Charger( 696, "batterycharger.16.tier.06", "Ludicrous Voltage Battery Charger", 6, "Each battery gives 8A in/4A out (min 4A/2A)", - 4) - .getStackForm(1L)); - ItemList.Battery_Charger_4by4_ZPM.set(new GT_MetaTileEntity_Charger( + 4).getStackForm(1L)); + ItemList.Battery_Charger_4by4_ZPM.set( + new GT_MetaTileEntity_Charger( 697, "batterycharger.16.tier.07", "ZPM Voltage Battery Charger", 7, "Each battery gives 8A in/4A out (min 4A/2A)", - 4) - .getStackForm(1L)); - ItemList.Battery_Charger_4by4_UV.set(new GT_MetaTileEntity_Charger( + 4).getStackForm(1L)); + ItemList.Battery_Charger_4by4_UV.set( + new GT_MetaTileEntity_Charger( 698, "batterycharger.16.tier.08", "Ultimate Voltage Battery Charger", 8, "Each battery gives 8A in/4A out (min 4A/2A)", - 4) - .getStackForm(1L)); - ItemList.Battery_Charger_4by4_MAX.set(new GT_MetaTileEntity_Charger( + 4).getStackForm(1L)); + ItemList.Battery_Charger_4by4_MAX.set( + new GT_MetaTileEntity_Charger( 699, "batterycharger.16.tier.09", "Highly Ultimate Voltage Battery Charger", 9, "Each battery gives 8A in/4A out (min 4A/2A)", - 4) - .getStackForm(1L)); + 4).getStackForm(1L)); { // Wireless Energy Hatches - ItemList.Wireless_Hatch_Energy_ULV.set(new GT_MetaTileEntity_Wireless_Hatch( - 206, "hatch.wireless.receiver.tier.00", "ULV Wireless Energy Hatch", 0) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_LV.set(new GT_MetaTileEntity_Wireless_Hatch( - 207, "hatch.wireless.receiver.tier.01", "LV Wireless Energy Hatch", 1) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_MV.set(new GT_MetaTileEntity_Wireless_Hatch( - 208, "hatch.wireless.receiver.tier.02", "MV Wireless Energy Hatch", 2) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_HV.set(new GT_MetaTileEntity_Wireless_Hatch( - 209, "hatch.wireless.receiver.tier.03", "HV Wireless Energy Hatch", 3) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_EV.set(new GT_MetaTileEntity_Wireless_Hatch( - 216, "hatch.wireless.receiver.tier.04", "EV Wireless Energy Hatch", 4) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_IV.set(new GT_MetaTileEntity_Wireless_Hatch( - 217, "hatch.wireless.receiver.tier.05", "IV Wireless Energy Hatch", 5) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_LuV.set(new GT_MetaTileEntity_Wireless_Hatch( - 218, "hatch.wireless.receiver.tier.06", "LuV Wireless Energy Hatch", 6) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_ZPM.set(new GT_MetaTileEntity_Wireless_Hatch( - 219, "hatch.wireless.receiver.tier.07", "ZPM Wireless Energy Hatch", 7) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_UV.set(new GT_MetaTileEntity_Wireless_Hatch( - 227, "hatch.wireless.receiver.tier.08", "UV Wireless Energy Hatch", 8) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_UHV.set(new GT_MetaTileEntity_Wireless_Hatch( - 229, "hatch.wireless.receiver.tier.09", "UHV Wireless Energy Hatch", 9) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_UEV.set(new GT_MetaTileEntity_Wireless_Hatch( - 266, "hatch.wireless.receiver.tier.10", "UEV Wireless Energy Hatch", 10) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_UIV.set(new GT_MetaTileEntity_Wireless_Hatch( - 267, "hatch.wireless.receiver.tier.11", "UIV Wireless Energy Hatch", 11) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_UMV.set(new GT_MetaTileEntity_Wireless_Hatch( - 268, "hatch.wireless.receiver.tier.12", "UMV Wireless Energy Hatch", 12) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_UXV.set(new GT_MetaTileEntity_Wireless_Hatch( - 269, "hatch.wireless.receiver.tier.13", "UXV Wireless Energy Hatch", 13) - .getStackForm(1L)); - ItemList.Wireless_Hatch_Energy_MAX.set(new GT_MetaTileEntity_Wireless_Hatch( - 286, "hatch.wireless.receiver.tier.14", "MAX Wireless Energy Hatch", 14) - .getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_ULV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 206, + "hatch.wireless.receiver.tier.00", + "ULV Wireless Energy Hatch", + 0).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_LV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 207, + "hatch.wireless.receiver.tier.01", + "LV Wireless Energy Hatch", + 1).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_MV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 208, + "hatch.wireless.receiver.tier.02", + "MV Wireless Energy Hatch", + 2).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_HV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 209, + "hatch.wireless.receiver.tier.03", + "HV Wireless Energy Hatch", + 3).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_EV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 216, + "hatch.wireless.receiver.tier.04", + "EV Wireless Energy Hatch", + 4).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_IV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 217, + "hatch.wireless.receiver.tier.05", + "IV Wireless Energy Hatch", + 5).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_LuV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 218, + "hatch.wireless.receiver.tier.06", + "LuV Wireless Energy Hatch", + 6).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_ZPM.set( + new GT_MetaTileEntity_Wireless_Hatch( + 219, + "hatch.wireless.receiver.tier.07", + "ZPM Wireless Energy Hatch", + 7).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_UV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 227, + "hatch.wireless.receiver.tier.08", + "UV Wireless Energy Hatch", + 8).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_UHV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 229, + "hatch.wireless.receiver.tier.09", + "UHV Wireless Energy Hatch", + 9).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_UEV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 266, + "hatch.wireless.receiver.tier.10", + "UEV Wireless Energy Hatch", + 10).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_UIV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 267, + "hatch.wireless.receiver.tier.11", + "UIV Wireless Energy Hatch", + 11).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_UMV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 268, + "hatch.wireless.receiver.tier.12", + "UMV Wireless Energy Hatch", + 12).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_UXV.set( + new GT_MetaTileEntity_Wireless_Hatch( + 269, + "hatch.wireless.receiver.tier.13", + "UXV Wireless Energy Hatch", + 13).getStackForm(1L)); + ItemList.Wireless_Hatch_Energy_MAX.set( + new GT_MetaTileEntity_Wireless_Hatch( + 286, + "hatch.wireless.receiver.tier.14", + "MAX Wireless Energy Hatch", + 14).getStackForm(1L)); // Wireless Dynamo Hatches - ItemList.Wireless_Dynamo_Energy_ULV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 287, "hatch.wireless.transmitter.tier.00", "ULV Wireless Energy Dynamo", 0) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_LV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 288, "hatch.wireless.transmitter.tier.01", "LV Wireless Energy Dynamo", 1) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_MV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 289, "hatch.wireless.transmitter.tier.02", "MV Wireless Energy Dynamo", 2) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_HV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 296, "hatch.wireless.transmitter.tier.03", "HV Wireless Energy Dynamo", 3) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_EV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 297, "hatch.wireless.transmitter.tier.04", "EV Wireless Energy Dynamo", 4) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_IV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 298, "hatch.wireless.transmitter.tier.05", "IV Wireless Energy Dynamo", 5) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_LuV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 299, "hatch.wireless.transmitter.tier.06", "LuV Wireless Energy Dynamo", 6) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_ZPM.set(new GT_MetaTileEntity_Wireless_Dynamo( - 310, "hatch.wireless.transmitter.tier.07", "ZPM Wireless Energy Dynamo", 7) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_UV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 316, "hatch.wireless.transmitter.tier.08", "UV Wireless Energy Dynamo", 8) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_UHV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 317, "hatch.wireless.transmitter.tier.09", "UHV Wireless Energy Dynamo", 9) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_UEV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 318, "hatch.wireless.transmitter.tier.10", "UEV Wireless Energy Dynamo", 10) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_UIV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 319, "hatch.wireless.transmitter.tier.11", "UIV Wireless Energy Dynamo", 11) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_UMV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 346, "hatch.wireless.transmitter.tier.12", "UMV Wireless Energy Dynamo", 12) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_UXV.set(new GT_MetaTileEntity_Wireless_Dynamo( - 347, "hatch.wireless.transmitter.tier.13", "UXV Wireless Energy Dynamo", 13) - .getStackForm(1L)); - ItemList.Wireless_Dynamo_Energy_MAX.set(new GT_MetaTileEntity_Wireless_Dynamo( - 348, "hatch.wireless.transmitter.tier.14", "MAX Wireless Energy Dynamo", 14) - .getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_ULV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 287, + "hatch.wireless.transmitter.tier.00", + "ULV Wireless Energy Dynamo", + 0).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_LV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 288, + "hatch.wireless.transmitter.tier.01", + "LV Wireless Energy Dynamo", + 1).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_MV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 289, + "hatch.wireless.transmitter.tier.02", + "MV Wireless Energy Dynamo", + 2).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_HV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 296, + "hatch.wireless.transmitter.tier.03", + "HV Wireless Energy Dynamo", + 3).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_EV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 297, + "hatch.wireless.transmitter.tier.04", + "EV Wireless Energy Dynamo", + 4).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_IV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 298, + "hatch.wireless.transmitter.tier.05", + "IV Wireless Energy Dynamo", + 5).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_LuV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 299, + "hatch.wireless.transmitter.tier.06", + "LuV Wireless Energy Dynamo", + 6).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_ZPM.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 310, + "hatch.wireless.transmitter.tier.07", + "ZPM Wireless Energy Dynamo", + 7).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_UV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 316, + "hatch.wireless.transmitter.tier.08", + "UV Wireless Energy Dynamo", + 8).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_UHV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 317, + "hatch.wireless.transmitter.tier.09", + "UHV Wireless Energy Dynamo", + 9).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_UEV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 318, + "hatch.wireless.transmitter.tier.10", + "UEV Wireless Energy Dynamo", + 10).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_UIV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 319, + "hatch.wireless.transmitter.tier.11", + "UIV Wireless Energy Dynamo", + 11).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_UMV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 346, + "hatch.wireless.transmitter.tier.12", + "UMV Wireless Energy Dynamo", + 12).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_UXV.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 347, + "hatch.wireless.transmitter.tier.13", + "UXV Wireless Energy Dynamo", + 13).getStackForm(1L)); + ItemList.Wireless_Dynamo_Energy_MAX.set( + new GT_MetaTileEntity_Wireless_Dynamo( + 348, + "hatch.wireless.transmitter.tier.14", + "MAX Wireless Energy Dynamo", + 14).getStackForm(1L)); } - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_ULV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - "BCB", - 'M', - ItemList.Hull_ULV, - 'W', - OrePrefixes.wireGt16.get(Materials.Lead), - 'T', - OreDictNames.craftingChest, - 'B', - ItemList.Battery_RE_ULV_Tantalum, - 'C', - OrePrefixes.circuit.get(Materials.Primitive) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_LV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - "BCB", - 'M', - ItemList.Hull_LV, - 'W', - OrePrefixes.wireGt16.get(Materials.Tin), - 'T', - OreDictNames.craftingChest, - 'B', - ItemList.Battery_RE_LV_Lithium, - 'C', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_MV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - "BCB", - 'M', - ItemList.Hull_MV, - 'W', - OrePrefixes.wireGt16.get(Materials.AnyCopper), - 'T', - OreDictNames.craftingChest, - 'B', - ItemList.Battery_RE_MV_Lithium, - 'C', - OrePrefixes.circuit.get(Materials.Good) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_HV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - "BCB", - 'M', - ItemList.Hull_HV, - 'W', - OrePrefixes.wireGt16.get(Materials.Gold), - 'T', - OreDictNames.craftingChest, - 'B', - ItemList.Battery_RE_HV_Lithium, - 'C', - OrePrefixes.circuit.get(Materials.Advanced) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_EV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - "BCB", - 'M', - ItemList.Hull_EV, - 'W', - OrePrefixes.wireGt16.get(Materials.Aluminium), - 'T', - OreDictNames.craftingChest, - 'B', - OrePrefixes.battery.get(Materials.Master), - 'C', - OrePrefixes.circuit.get(Materials.Data) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_IV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - "BCB", - 'M', - ItemList.Hull_IV, - 'W', - OrePrefixes.wireGt16.get(Materials.Tungsten), - 'T', - OreDictNames.craftingChest, - 'B', - ItemList.Energy_LapotronicOrb, - 'C', - OrePrefixes.circuit.get(Materials.Elite) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_LuV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - "BCB", - 'M', - ItemList.Hull_LuV, - 'W', - OrePrefixes.wireGt16.get(Materials.VanadiumGallium), - 'T', - OreDictNames.craftingChest, - 'B', - ItemList.Energy_LapotronicOrb2, - 'C', - OrePrefixes.circuit.get(Materials.Master) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_ZPM.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - "BCB", - 'M', - ItemList.Hull_ZPM, - 'W', - OrePrefixes.wireGt16.get(Materials.Naquadah), - 'T', - OreDictNames.craftingChest, - 'B', - ItemList.Energy_LapotronicOrb2, - 'C', - OrePrefixes.circuit.get(Materials.Ultimate) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_UV.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - "BCB", - 'M', - ItemList.Hull_UV, - 'W', - OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), - 'T', - OreDictNames.craftingChest, - 'B', - ItemList.ZPM2, - 'C', - OrePrefixes.circuit.get(Materials.SuperconductorUHV) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_MAX.get(1L), bitsd, new Object[] { - aTextWireChest, - aTextWireHull, - "BCB", - 'M', - ItemList.Hull_MAX, - 'W', - OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), - 'T', - OreDictNames.craftingChest, - 'B', - ItemList.ZPM2, - 'C', - OrePrefixes.circuit.get(Materials.Infinite) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.Locker_ULV.get(1L), bitsd, new Object[] { - "T", "M", 'M', ItemList.Battery_Buffer_2by2_ULV, 'T', OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_LV.get(1L), bitsd, new Object[] { - "T", "M", 'M', ItemList.Battery_Buffer_2by2_LV, 'T', OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_MV.get(1L), bitsd, new Object[] { - "T", "M", 'M', ItemList.Battery_Buffer_2by2_MV, 'T', OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_HV.get(1L), bitsd, new Object[] { - "T", "M", 'M', ItemList.Battery_Buffer_2by2_HV, 'T', OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_EV.get(1L), bitsd, new Object[] { - "T", "M", 'M', ItemList.Battery_Buffer_2by2_EV, 'T', OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_IV.get(1L), bitsd, new Object[] { - "T", "M", 'M', ItemList.Battery_Buffer_2by2_IV, 'T', OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_LuV.get(1L), bitsd, new Object[] { - "T", "M", 'M', ItemList.Battery_Buffer_2by2_LuV, 'T', OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_ZPM.get(1L), bitsd, new Object[] { - "T", "M", 'M', ItemList.Battery_Buffer_2by2_ZPM, 'T', OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_UV.get(1L), bitsd, new Object[] { - "T", "M", 'M', ItemList.Battery_Buffer_2by2_UV, 'T', OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_MAX.get(1L), bitsd, new Object[] { - "T", "M", 'M', ItemList.Battery_Buffer_2by2_MAX, 'T', OreDictNames.craftingChest - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Charger_4by4_ULV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ULV, 'W', + OrePrefixes.wireGt16.get(Materials.Lead), 'T', OreDictNames.craftingChest, 'B', + ItemList.Battery_RE_ULV_Tantalum, 'C', OrePrefixes.circuit.get(Materials.Primitive) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Charger_4by4_LV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LV, 'W', + OrePrefixes.wireGt16.get(Materials.Tin), 'T', OreDictNames.craftingChest, 'B', + ItemList.Battery_RE_LV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Charger_4by4_MV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MV, 'W', + OrePrefixes.wireGt16.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest, 'B', + ItemList.Battery_RE_MV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Good) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Charger_4by4_HV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_HV, 'W', + OrePrefixes.wireGt16.get(Materials.Gold), 'T', OreDictNames.craftingChest, 'B', + ItemList.Battery_RE_HV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Advanced) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Charger_4by4_EV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_EV, 'W', + OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest, 'B', + OrePrefixes.battery.get(Materials.Master), 'C', OrePrefixes.circuit.get(Materials.Data) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Charger_4by4_IV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_IV, 'W', + OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest, 'B', + ItemList.Energy_LapotronicOrb, 'C', OrePrefixes.circuit.get(Materials.Elite) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Charger_4by4_LuV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LuV, 'W', + OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest, 'B', + ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.Master) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Charger_4by4_ZPM.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ZPM, 'W', + OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest, 'B', + ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.Ultimate) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Charger_4by4_UV.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_UV, 'W', + OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest, 'B', + ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Battery_Charger_4by4_MAX.get(1L), + bitsd, + new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MAX, 'W', + OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest, 'B', + ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.Infinite) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.Locker_ULV.get(1L), + bitsd, + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_ULV, 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Locker_LV.get(1L), + bitsd, + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_LV, 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Locker_MV.get(1L), + bitsd, + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_MV, 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Locker_HV.get(1L), + bitsd, + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_HV, 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Locker_EV.get(1L), + bitsd, + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_EV, 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Locker_IV.get(1L), + bitsd, + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_IV, 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Locker_LuV.get(1L), + bitsd, + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_LuV, 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Locker_ZPM.get(1L), + bitsd, + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_ZPM, 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Locker_UV.get(1L), + bitsd, + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_UV, 'T', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Locker_MAX.get(1L), + bitsd, + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_MAX, 'T', OreDictNames.craftingChest }); } private static void run2() { - ItemList.Machine_LV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ItemList.Machine_LV_AlloySmelter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 201, "basicmachine.alloysmelter.tier.01", "Basic Alloy Smelter", @@ -2904,21 +2498,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ALLOY_SMELTER", - new Object[] { - "ECE", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_MV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_MV_AlloySmelter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 202, "basicmachine.alloysmelter.tier.02", "Advanced Alloy Smelter", @@ -2936,21 +2522,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ALLOY_SMELTER", - new Object[] { - "ECE", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_HV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_HV_AlloySmelter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 203, "basicmachine.alloysmelter.tier.03", "Advanced Alloy Smelter II", @@ -2968,21 +2546,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ALLOY_SMELTER", - new Object[] { - "ECE", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_EV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_EV_AlloySmelter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 204, "basicmachine.alloysmelter.tier.04", "Advanced Alloy Smelter III", @@ -3000,21 +2570,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ALLOY_SMELTER", - new Object[] { - "ECE", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_IV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_IV_AlloySmelter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 205, "basicmachine.alloysmelter.tier.05", "Advanced Alloy Smelter IV", @@ -3032,22 +2594,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ALLOY_SMELTER", - new Object[] { - "ECE", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Assembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + + ItemList.Machine_LV_Assembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 211, "basicmachine.assembler.tier.01", "Basic Assembling Machine", @@ -3065,23 +2619,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Assembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_Assembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 212, "basicmachine.assembler.tier.02", "Advanced Assembling Machine", @@ -3099,23 +2644,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Assembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_Assembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 213, "basicmachine.assembler.tier.03", "Advanced Assembling Machine II", @@ -3133,23 +2669,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Assembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_Assembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 214, "basicmachine.assembler.tier.04", "Advanced Assembling Machine III", @@ -3167,23 +2694,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Assembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_Assembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 215, "basicmachine.assembler.tier.05", "Advanced Assembling Machine IV", @@ -3201,24 +2719,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Bender.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_Bender.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 221, "basicmachine.bender.tier.01", "Basic Bending Machine", @@ -3236,23 +2745,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "BENDER", - new Object[] { - aTextPlateWrench, - aTextCableHull, - aTextMotorWire, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Bender.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_Bender.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 222, "basicmachine.bender.tier.02", "Advanced Bending Machine", @@ -3270,23 +2770,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "BENDER", - new Object[] { - aTextPlateWrench, - aTextCableHull, - aTextMotorWire, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Bender.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_Bender.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 223, "basicmachine.bender.tier.03", "Advanced Bending Machine II", @@ -3304,23 +2795,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "BENDER", - new Object[] { - aTextPlateWrench, - aTextCableHull, - aTextMotorWire, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Bender.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_Bender.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 224, "basicmachine.bender.tier.04", "Advanced Bending Machine III", @@ -3338,23 +2820,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "BENDER", - new Object[] { - aTextPlateWrench, - aTextCableHull, - aTextMotorWire, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Bender.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_Bender.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 225, "basicmachine.bender.tier.05", "Advanced Bending Machine IV", @@ -3372,24 +2845,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "BENDER", - new Object[] { - aTextPlateWrench, - aTextCableHull, - aTextMotorWire, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Canner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_Canner.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 231, "basicmachine.canner.tier.01", "Basic Canning Machine", @@ -3407,23 +2871,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CANNER", - new Object[] { - aTextWirePump, - aTextCableHull, - "GGG", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_Canner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_Canner.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 232, "basicmachine.canner.tier.02", "Advanced Canning Machine", @@ -3441,23 +2896,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CANNER", - new Object[] { - aTextWirePump, - aTextCableHull, - "GGG", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_Canner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_Canner.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 233, "basicmachine.canner.tier.03", "Advanced Canning Machine II", @@ -3475,23 +2921,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CANNER", - new Object[] { - aTextWirePump, - aTextCableHull, - "GGG", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_Canner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_Canner.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 234, "basicmachine.canner.tier.04", "Advanced Canning Machine III", @@ -3509,23 +2946,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CANNER", - new Object[] { - aTextWirePump, - aTextCableHull, - "GGG", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_Canner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_Canner.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 235, "basicmachine.canner.tier.05", "Advanced Canning Machine IV", @@ -3543,24 +2971,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CANNER", - new Object[] { - aTextWirePump, - aTextCableHull, - "GGG", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Compressor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + + ItemList.Machine_LV_Compressor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 241, "basicmachine.compressor.tier.01", "Basic Compressor", @@ -3578,21 +2997,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "COMPRESSOR", - new Object[] { - aTextWireCoil, - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Compressor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_Compressor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 242, "basicmachine.compressor.tier.02", "Advanced Compressor", @@ -3610,21 +3021,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "COMPRESSOR", - new Object[] { - aTextWireCoil, - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Compressor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_Compressor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 243, "basicmachine.compressor.tier.03", "Advanced Compressor II", @@ -3642,21 +3045,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "COMPRESSOR", - new Object[] { - aTextWireCoil, - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Compressor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_Compressor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 244, "basicmachine.compressor.tier.04", "Advanced Compressor III", @@ -3674,21 +3069,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "COMPRESSOR", - new Object[] { - aTextWireCoil, - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Compressor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_Compressor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 245, "basicmachine.compressor.tier.05", "Singularity Compressor", @@ -3706,22 +3093,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "COMPRESSOR", - new Object[] { - aTextWireCoil, - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_Cutter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 251, "basicmachine.cutter.tier.01", "Basic Cutting Machine", @@ -3739,27 +3118,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CUTTER", - new Object[] { - "WCG", - "VMB", - "CWE", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, - 'B', - OreDictNames.craftingDiamondBlade - }) - .getStackForm(1L)); - ItemList.Machine_MV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', + OreDictNames.craftingDiamondBlade }).getStackForm(1L)); + ItemList.Machine_MV_Cutter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 252, "basicmachine.cutter.tier.02", "Advanced Cutting Machine", @@ -3777,27 +3144,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CUTTER", - new Object[] { - "WCG", - "VMB", - "CWE", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, - 'B', - OreDictNames.craftingDiamondBlade - }) - .getStackForm(1L)); - ItemList.Machine_HV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', + OreDictNames.craftingDiamondBlade }).getStackForm(1L)); + ItemList.Machine_HV_Cutter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 253, "basicmachine.cutter.tier.03", "Advanced Cutting Machine II", @@ -3815,27 +3170,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CUTTER", - new Object[] { - "WCG", - "VMB", - "CWE", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, - 'B', - OreDictNames.craftingDiamondBlade - }) - .getStackForm(1L)); - ItemList.Machine_EV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', + OreDictNames.craftingDiamondBlade }).getStackForm(1L)); + ItemList.Machine_EV_Cutter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 254, "basicmachine.cutter.tier.04", "Advanced Cutting Machine III", @@ -3853,27 +3196,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CUTTER", - new Object[] { - "WCG", - "VMB", - "CWE", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, - 'B', - OreDictNames.craftingDiamondBlade - }) - .getStackForm(1L)); - ItemList.Machine_IV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', + OreDictNames.craftingDiamondBlade }).getStackForm(1L)); + ItemList.Machine_IV_Cutter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 255, "basicmachine.cutter.tier.05", "Advanced Cutting Machine IV", @@ -3891,28 +3222,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CUTTER", - new Object[] { - "WCG", - "VMB", - "CWE", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, - 'B', - OreDictNames.craftingDiamondBlade - }) - .getStackForm(1L)); - - ItemList.Machine_LV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', + OreDictNames.craftingDiamondBlade }).getStackForm(1L)); + + ItemList.Machine_LV_E_Furnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 261, "basicmachine.e_furnace.tier.01", "Basic Electric Furnace", @@ -3930,22 +3249,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTRIC_FURNACE", - new Object[] { - "ECE", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING - }) - .setProgressBarTextureName("E_Furnace") - .getStackForm(1L)); - ItemList.Machine_MV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) + .setProgressBarTextureName("E_Furnace").getStackForm(1L)); + ItemList.Machine_MV_E_Furnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 262, "basicmachine.e_furnace.tier.02", "Advanced Electric Furnace", @@ -3963,22 +3274,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTRIC_FURNACE", - new Object[] { - "ECE", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING - }) - .setProgressBarTextureName("E_Furnace") - .getStackForm(1L)); - ItemList.Machine_HV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) + .setProgressBarTextureName("E_Furnace").getStackForm(1L)); + ItemList.Machine_HV_E_Furnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 263, "basicmachine.e_furnace.tier.03", "Advanced Electric Furnace II", @@ -3996,22 +3299,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTRIC_FURNACE", - new Object[] { - "ECE", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING - }) - .setProgressBarTextureName("E_Furnace") - .getStackForm(1L)); - ItemList.Machine_EV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) + .setProgressBarTextureName("E_Furnace").getStackForm(1L)); + ItemList.Machine_EV_E_Furnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 264, "basicmachine.e_furnace.tier.04", "Advanced Electric Furnace III", @@ -4029,22 +3324,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTRIC_FURNACE", - new Object[] { - "ECE", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING - }) - .setProgressBarTextureName("E_Furnace") - .getStackForm(1L)); - ItemList.Machine_IV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) + .setProgressBarTextureName("E_Furnace").getStackForm(1L)); + ItemList.Machine_IV_E_Furnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 265, "basicmachine.e_furnace.tier.05", "Electron Exitement Processor", @@ -4062,23 +3349,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTRIC_FURNACE", - new Object[] { - "ECE", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING - }) - .setProgressBarTextureName("E_Furnace") - .getStackForm(1L)); - - ItemList.Machine_LV_Extractor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) + .setProgressBarTextureName("E_Furnace").getStackForm(1L)); + + ItemList.Machine_LV_Extractor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 271, "basicmachine.extractor.tier.01", "Basic Extractor", @@ -4096,25 +3375,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "EXTRACTOR", - new Object[] { - "GCG", - "EMP", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_Extractor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", "EMP", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_Extractor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 272, "basicmachine.extractor.tier.02", "Advanced Extractor", @@ -4132,25 +3401,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "EXTRACTOR", - new Object[] { - "GCG", - "EMP", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_Extractor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", "EMP", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_Extractor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 273, "basicmachine.extractor.tier.03", "Advanced Extractor II", @@ -4168,25 +3427,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "EXTRACTOR", - new Object[] { - "GCG", - "EMP", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_Extractor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", "EMP", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_Extractor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 274, "basicmachine.extractor.tier.04", "Advanced Extractor III", @@ -4204,25 +3453,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "EXTRACTOR", - new Object[] { - "GCG", - "EMP", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_Extractor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", "EMP", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_Extractor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 275, "basicmachine.extractor.tier.05", "Vacuum Extractor", @@ -4240,26 +3479,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "EXTRACTOR", - new Object[] { - "GCG", - "EMP", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Extruder.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", "EMP", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + + ItemList.Machine_LV_Extruder.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 281, "basicmachine.extruder.tier.01", "Basic Extruder", @@ -4277,23 +3506,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "EXTRUDER", - new Object[] { - "CCE", - "XMP", - "CCE", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'X', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Extruder.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_MV_Extruder.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 282, "basicmachine.extruder.tier.02", "Advanced Extruder", @@ -4311,23 +3530,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "EXTRUDER", - new Object[] { - "CCE", - "XMP", - "CCE", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'X', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Extruder.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_HV_Extruder.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 283, "basicmachine.extruder.tier.03", "Advanced Extruder II", @@ -4345,23 +3554,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "EXTRUDER", - new Object[] { - "CCE", - "XMP", - "CCE", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'X', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Extruder.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_EV_Extruder.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 284, "basicmachine.extruder.tier.04", "Advanced Extruder III", @@ -4379,23 +3578,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "EXTRUDER", - new Object[] { - "CCE", - "XMP", - "CCE", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'X', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Extruder.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_IV_Extruder.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 285, "basicmachine.extruder.tier.05", "Advanced Extruder IV", @@ -4413,24 +3602,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "EXTRUDER", - new Object[] { - "CCE", - "XMP", - "CCE", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'X', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Lathe.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + + ItemList.Machine_LV_Lathe.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 291, "basicmachine.lathe.tier.01", "Basic Lathe", @@ -4448,25 +3627,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "LATHE", - new Object[] { - aTextWireCoil, - "EMD", - "CWP", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'D', - OrePrefixes.gem.get(Materials.Diamond) - }) - .getStackForm(1L)); - ItemList.Machine_MV_Lathe.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, "EMD", "CWP", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'D', + OrePrefixes.gem.get(Materials.Diamond) }).getStackForm(1L)); + ItemList.Machine_MV_Lathe.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 292, "basicmachine.lathe.tier.02", "Advanced Lathe", @@ -4484,25 +3653,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "LATHE", - new Object[] { - aTextWireCoil, - "EMD", - "CWP", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'D', - OrePrefixes.gemFlawless.get(Materials.Diamond) - }) - .getStackForm(1L)); - ItemList.Machine_HV_Lathe.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, "EMD", "CWP", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'D', + OrePrefixes.gemFlawless.get(Materials.Diamond) }).getStackForm(1L)); + ItemList.Machine_HV_Lathe.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 293, "basicmachine.lathe.tier.03", "Advanced Lathe II", @@ -4520,25 +3679,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "LATHE", - new Object[] { - aTextWireCoil, - "EMD", - "CWP", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'D', - OreDictNames.craftingIndustrialDiamond - }) - .getStackForm(1L)); - ItemList.Machine_EV_Lathe.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, "EMD", "CWP", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'D', + OreDictNames.craftingIndustrialDiamond }).getStackForm(1L)); + ItemList.Machine_EV_Lathe.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 294, "basicmachine.lathe.tier.04", "Advanced Lathe III", @@ -4556,25 +3705,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "LATHE", - new Object[] { - aTextWireCoil, - "EMD", - "CWP", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'D', - OreDictNames.craftingIndustrialDiamond - }) - .getStackForm(1L)); - ItemList.Machine_IV_Lathe.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, "EMD", "CWP", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'D', + OreDictNames.craftingIndustrialDiamond }).getStackForm(1L)); + ItemList.Machine_IV_Lathe.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 295, "basicmachine.lathe.tier.05", "Advanced Lathe IV", @@ -4592,26 +3731,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "LATHE", - new Object[] { - aTextWireCoil, - "EMD", - "CWP", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'D', - OreDictNames.craftingIndustrialDiamond - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Macerator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, "EMD", "CWP", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'D', + OreDictNames.craftingIndustrialDiamond }).getStackForm(1L)); + + ItemList.Machine_LV_Macerator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 301, "basicmachine.macerator.tier.01", "Basic Macerator", @@ -4629,25 +3758,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "MACERATOR", - new Object[] { - "PEG", - "WWM", - "CCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OrePrefixes.gem.get(Materials.Diamond) - }) - .getStackForm(1L)); - ItemList.Machine_MV_Macerator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PEG", "WWM", "CCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + OrePrefixes.gem.get(Materials.Diamond) }).getStackForm(1L)); + ItemList.Machine_MV_Macerator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 302, "basicmachine.macerator.tier.02", "Advanced Macerator", @@ -4665,25 +3783,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "MACERATOR", - new Object[] { - "PEG", - "WWM", - "CCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OrePrefixes.gemFlawless.get(Materials.Diamond) - }) - .getStackForm(1L)); - ItemList.Machine_HV_Macerator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PEG", "WWM", "CCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + OrePrefixes.gemFlawless.get(Materials.Diamond) }).getStackForm(1L)); + ItemList.Machine_HV_Macerator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 303, "basicmachine.macerator.tier.03", "Universal Macerator", @@ -4701,25 +3808,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PULVERIZER", - new Object[] { - "PEG", - "WWM", - "CCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OreDictNames.craftingGrinder - }) - .getStackForm(1L)); - ItemList.Machine_EV_Macerator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PEG", "WWM", "CCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OreDictNames.craftingGrinder }) + .getStackForm(1L)); + ItemList.Machine_EV_Macerator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 304, "basicmachine.macerator.tier.04", "Universal Pulverizer", @@ -4737,25 +3833,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PULVERIZER", - new Object[] { - "PEG", - "WWM", - "CCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OreDictNames.craftingGrinder - }) - .getStackForm(1L)); - ItemList.Machine_IV_Macerator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PEG", "WWM", "CCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OreDictNames.craftingGrinder }) + .getStackForm(1L)); + ItemList.Machine_IV_Macerator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 305, "basicmachine.macerator.tier.05", "Blend-O-Matic 9001", @@ -4773,26 +3858,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PULVERIZER", - new Object[] { - "PEG", - "WWM", - "CCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OreDictNames.craftingGrinder - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Microwave.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PEG", "WWM", "CCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OreDictNames.craftingGrinder }) + .getStackForm(1L)); + + ItemList.Machine_LV_Microwave.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 311, "basicmachine.microwave.tier.01", "Basic Microwave", @@ -4810,25 +3884,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "MICROWAVE", - new Object[] { - "LWC", - "LMR", - "LEC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'L', - OrePrefixes.plate.get(Materials.Lead) - }) - .getStackForm(1L)); - ItemList.Machine_MV_Microwave.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "LWC", "LMR", "LEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'L', + OrePrefixes.plate.get(Materials.Lead) }).getStackForm(1L)); + ItemList.Machine_MV_Microwave.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 312, "basicmachine.microwave.tier.02", "Advanced Microwave", @@ -4846,25 +3909,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "MICROWAVE", - new Object[] { - "LWC", - "LMR", - "LEC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'L', - OrePrefixes.plate.get(Materials.Lead) - }) - .getStackForm(1L)); - ItemList.Machine_HV_Microwave.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "LWC", "LMR", "LEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'L', + OrePrefixes.plate.get(Materials.Lead) }).getStackForm(1L)); + ItemList.Machine_HV_Microwave.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 313, "basicmachine.microwave.tier.03", "Advanced Microwave II", @@ -4882,25 +3934,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "MICROWAVE", - new Object[] { - "LWC", - "LMR", - "LEC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'L', - OrePrefixes.plate.get(Materials.Lead) - }) - .getStackForm(1L)); - ItemList.Machine_EV_Microwave.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "LWC", "LMR", "LEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'L', + OrePrefixes.plate.get(Materials.Lead) }).getStackForm(1L)); + ItemList.Machine_EV_Microwave.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 314, "basicmachine.microwave.tier.04", "Advanced Microwave III", @@ -4918,25 +3959,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "MICROWAVE", - new Object[] { - "LWC", - "LMR", - "LEC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'L', - OrePrefixes.plate.get(Materials.Lead) - }) - .getStackForm(1L)); - ItemList.Machine_IV_Microwave.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "LWC", "LMR", "LEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'L', + OrePrefixes.plate.get(Materials.Lead) }).getStackForm(1L)); + ItemList.Machine_IV_Microwave.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 315, "basicmachine.microwave.tier.05", "Advanced Microwave IV", @@ -4954,26 +3984,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "MICROWAVE", - new Object[] { - "LWC", - "LMR", - "LEC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'L', - OrePrefixes.plate.get(Materials.Lead) - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Printer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "LWC", "LMR", "LEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'L', + OrePrefixes.plate.get(Materials.Lead) }).getStackForm(1L)); + + ItemList.Machine_LV_Printer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 321, "basicmachine.printer.tier.01", "Basic Printer", @@ -4991,21 +4010,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PRINTER", - new Object[] { - aTextMotorWire, - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Printer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_Printer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 322, "basicmachine.printer.tier.02", "Advanced Printer", @@ -5023,21 +4034,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PRINTER", - new Object[] { - aTextMotorWire, - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Printer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_Printer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 323, "basicmachine.printer.tier.03", "Advanced Printer II", @@ -5055,21 +4058,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PRINTER", - new Object[] { - aTextMotorWire, - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Printer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_Printer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 324, "basicmachine.printer.tier.04", "Advanced Printer III", @@ -5087,21 +4082,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PRINTER", - new Object[] { - aTextMotorWire, - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Printer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_Printer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 325, "basicmachine.printer.tier.05", "Advanced Printer IV", @@ -5119,21 +4106,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PRINTER", - new Object[] { - aTextMotorWire, - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_LuV_Printer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_LuV_Printer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 326, "basicmachine.printer.tier.06", "Advanced Printer V", @@ -5151,21 +4130,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PRINTER", - new Object[] { - aTextMotorWire, - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_ZPM_Printer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_ZPM_Printer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 327, "basicmachine.printer.tier.07", "Advanced Printer VI", @@ -5183,21 +4154,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PRINTER", - new Object[] { - aTextMotorWire, - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_UV_Printer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_UV_Printer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 328, "basicmachine.printer.tier.08", "Advanced Printer VII", @@ -5215,22 +4178,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.TOP_SMOKE, "PRINTER", - new Object[] { - aTextMotorWire, - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Recycler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_Recycler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 331, "basicmachine.recycler.tier.01", "Basic Recycler", @@ -5248,23 +4203,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "RECYCLER", - new Object[] { - "GCG", - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OrePrefixes.dust.get(Materials.Glowstone) - }) - .getStackForm(1L)); - ItemList.Machine_MV_Recycler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + OrePrefixes.dust.get(Materials.Glowstone) }).getStackForm(1L)); + ItemList.Machine_MV_Recycler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 332, "basicmachine.recycler.tier.02", "Advanced Recycler", @@ -5282,23 +4228,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "RECYCLER", - new Object[] { - "GCG", - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OrePrefixes.dust.get(Materials.Glowstone) - }) - .getStackForm(1L)); - ItemList.Machine_HV_Recycler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + OrePrefixes.dust.get(Materials.Glowstone) }).getStackForm(1L)); + ItemList.Machine_HV_Recycler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 333, "basicmachine.recycler.tier.03", "Advanced Recycler II", @@ -5316,23 +4253,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "RECYCLER", - new Object[] { - "GCG", - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OrePrefixes.dust.get(Materials.Glowstone) - }) - .getStackForm(1L)); - ItemList.Machine_EV_Recycler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + OrePrefixes.dust.get(Materials.Glowstone) }).getStackForm(1L)); + ItemList.Machine_EV_Recycler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 334, "basicmachine.recycler.tier.04", "Advanced Recycler III", @@ -5350,23 +4278,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "RECYCLER", - new Object[] { - "GCG", - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OrePrefixes.dust.get(Materials.Glowstone) - }) - .getStackForm(1L)); - ItemList.Machine_IV_Recycler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + OrePrefixes.dust.get(Materials.Glowstone) }).getStackForm(1L)); + ItemList.Machine_IV_Recycler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 335, "basicmachine.recycler.tier.05", "The Oblitterator", @@ -5384,22 +4303,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "RECYCLER", - new Object[] { - "GCG", - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OrePrefixes.dust.get(Materials.Glowstone) - }) - .getStackForm(1L)); + new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + OrePrefixes.dust.get(Materials.Glowstone) }).getStackForm(1L)); ItemList.Machine_LV_Scanner.set( new GT_MetaTileEntity_Scanner(341, "basicmachine.scanner.tier.01", "Basic Scanner", 1) @@ -5417,83 +4326,39 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_Scanner(345, "basicmachine.scanner.tier.05", "Advanced Scanner IV", 5) .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Scanner.get(1L), bitsd, new Object[] { - "CTC", - aTextWireHull, - "CRC", - 'M', - ItemList.Hull_LV, - 'T', - ItemList.Emitter_LV, - 'R', - ItemList.Sensor_LV, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Scanner.get(1L), bitsd, new Object[] { - "CTC", - aTextWireHull, - "CRC", - 'M', - ItemList.Hull_MV, - 'T', - ItemList.Emitter_MV, - 'R', - ItemList.Sensor_MV, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.AnyCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Scanner.get(1L), bitsd, new Object[] { - "CTC", - aTextWireHull, - "CRC", - 'M', - ItemList.Hull_HV, - 'T', - ItemList.Emitter_HV, - 'R', - ItemList.Sensor_HV, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Scanner.get(1L), bitsd, new Object[] { - "CTC", - aTextWireHull, - "CRC", - 'M', - ItemList.Hull_EV, - 'T', - ItemList.Emitter_EV, - 'R', - ItemList.Sensor_EV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt01.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Scanner.get(1L), bitsd, new Object[] { - "CTC", - aTextWireHull, - "CRC", - 'M', - ItemList.Hull_IV, - 'T', - ItemList.Emitter_IV, - 'R', - ItemList.Sensor_IV, - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'W', - OrePrefixes.cableGt01.get(Materials.Tungsten) - }); - - ItemList.Machine_LV_Wiremill.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_LV_Scanner.get(1L), + bitsd, + new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_LV, 'T', ItemList.Emitter_LV, 'R', + ItemList.Sensor_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.cableGt01.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_MV_Scanner.get(1L), + bitsd, + new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_MV, 'T', ItemList.Emitter_MV, 'R', + ItemList.Sensor_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.cableGt01.get(Materials.AnyCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HV_Scanner.get(1L), + bitsd, + new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_HV, 'T', ItemList.Emitter_HV, 'R', + ItemList.Sensor_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + OrePrefixes.cableGt01.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_EV_Scanner.get(1L), + bitsd, + new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_EV, 'T', ItemList.Emitter_EV, 'R', + ItemList.Sensor_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.cableGt01.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_IV_Scanner.get(1L), + bitsd, + new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_IV, 'T', ItemList.Emitter_IV, 'R', + ItemList.Sensor_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', + OrePrefixes.cableGt01.get(Materials.Tungsten) }); + + ItemList.Machine_LV_Wiremill.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 351, "basicmachine.wiremill.tier.01", "Basic Wiremill", @@ -5511,21 +4376,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "WIREMILL", - new Object[] { - aTextMotorWire, - aTextCableHull, - aTextMotorWire, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Wiremill.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_Wiremill.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 352, "basicmachine.wiremill.tier.02", "Advanced Wiremill", @@ -5543,21 +4400,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "WIREMILL", - new Object[] { - aTextMotorWire, - aTextCableHull, - aTextMotorWire, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Wiremill.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_Wiremill.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 353, "basicmachine.wiremill.tier.03", "Advanced Wiremill II", @@ -5575,21 +4424,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "WIREMILL", - new Object[] { - aTextMotorWire, - aTextCableHull, - aTextMotorWire, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Wiremill.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_Wiremill.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 354, "basicmachine.wiremill.tier.04", "Advanced Wiremill III", @@ -5607,21 +4448,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "WIREMILL", - new Object[] { - aTextMotorWire, - aTextCableHull, - aTextMotorWire, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Wiremill.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_Wiremill.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 355, "basicmachine.wiremill.tier.05", "Advanced Wiremill IV", @@ -5639,22 +4472,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "WIREMILL", - new Object[] { - aTextMotorWire, - aTextCableHull, - aTextMotorWire, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Centrifuge.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_Centrifuge.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 361, "basicmachine.centrifuge.tier.01", "Basic Centrifuge", @@ -5672,21 +4497,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CENTRIFUGE", - new Object[] { - "CEC", - aTextWireHull, - "CEC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Centrifuge.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", aTextWireHull, "CEC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_Centrifuge.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 362, "basicmachine.centrifuge.tier.02", "Advanced Centrifuge", @@ -5704,21 +4521,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CENTRIFUGE", - new Object[] { - "CEC", - aTextWireHull, - "CEC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Centrifuge.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", aTextWireHull, "CEC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_Centrifuge.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 363, "basicmachine.centrifuge.tier.03", "Turbo Centrifuge", @@ -5736,21 +4545,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CENTRIFUGE", - new Object[] { - "CEC", - aTextWireHull, - "CEC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Centrifuge.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", aTextWireHull, "CEC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_Centrifuge.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 364, "basicmachine.centrifuge.tier.04", "Molecular Separator", @@ -5768,21 +4569,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CENTRIFUGE", - new Object[] { - "CEC", - aTextWireHull, - "CEC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Centrifuge.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", aTextWireHull, "CEC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_Centrifuge.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 365, "basicmachine.centrifuge.tier.05", "Molecular Cyclone", @@ -5800,22 +4593,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CENTRIFUGE", - new Object[] { - "CEC", - aTextWireHull, - "CEC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Electrolyzer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", aTextWireHull, "CEC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_Electrolyzer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 371, "basicmachine.electrolyzer.tier.01", "Basic Electrolyzer", @@ -5833,25 +4618,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTROLYZER", - new Object[] { - "IGI", - "IMI", - "CWC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'I', - OrePrefixes.wireGt01.get(Materials.Gold), - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_Electrolyzer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "IGI", "IMI", "CWC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', + OrePrefixes.wireGt01.get(Materials.Gold), 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_Electrolyzer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 372, "basicmachine.electrolyzer.tier.02", "Advanced Electrolyzer", @@ -5869,25 +4643,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTROLYZER", - new Object[] { - "IGI", - "IMI", - "CWC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'I', - OrePrefixes.wireGt01.get(Materials.Silver), - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_Electrolyzer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "IGI", "IMI", "CWC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', + OrePrefixes.wireGt01.get(Materials.Silver), 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_Electrolyzer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 373, "basicmachine.electrolyzer.tier.03", "Advanced Electrolyzer II", @@ -5905,25 +4668,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTROLYZER", - new Object[] { - "IGI", - "IMI", - "CWC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'I', - OrePrefixes.wireGt01.get(Materials.Electrum), - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_Electrolyzer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "IGI", "IMI", "CWC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', + OrePrefixes.wireGt01.get(Materials.Electrum), 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_Electrolyzer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 374, "basicmachine.electrolyzer.tier.04", "Advanced Electrolyzer III", @@ -5941,25 +4693,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTROLYZER", - new Object[] { - "IGI", - "IMI", - "CWC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'I', - OrePrefixes.wireGt01.get(Materials.Platinum), - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_Electrolyzer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "IGI", "IMI", "CWC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', + OrePrefixes.wireGt01.get(Materials.Platinum), 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_Electrolyzer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 375, "basicmachine.electrolyzer.tier.05", "Molecular Disintegrator E-4908", @@ -5977,26 +4718,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTROLYZER", - new Object[] { - "IGI", - "IMI", - "CWC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'I', - OrePrefixes.wireGt01.get(Materials.HSSG), - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - - ItemList.Machine_LV_ThermalCentrifuge.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "IGI", "IMI", "CWC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', + OrePrefixes.wireGt01.get(Materials.HSSG), 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + + ItemList.Machine_LV_ThermalCentrifuge.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 381, "basicmachine.thermalcentrifuge.tier.01", "Basic Thermal Centrifuge", @@ -6014,23 +4744,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "THERMAL_CENTRIFUGE", - new Object[] { - "CEC", - "OMO", - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_MV_ThermalCentrifuge.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", "OMO", "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_MV_ThermalCentrifuge.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 382, "basicmachine.thermalcentrifuge.tier.02", "Advanced Thermal Centrifuge", @@ -6048,23 +4768,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "THERMAL_CENTRIFUGE", - new Object[] { - "CEC", - "OMO", - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_HV_ThermalCentrifuge.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", "OMO", "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_HV_ThermalCentrifuge.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 383, "basicmachine.thermalcentrifuge.tier.03", "Advanced Thermal Centrifuge II", @@ -6082,23 +4792,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "THERMAL_CENTRIFUGE", - new Object[] { - "CEC", - "OMO", - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_EV_ThermalCentrifuge.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", "OMO", "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_EV_ThermalCentrifuge.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 384, "basicmachine.thermalcentrifuge.tier.04", "Advanced Thermal Centrifuge III", @@ -6116,23 +4816,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "THERMAL_CENTRIFUGE", - new Object[] { - "CEC", - "OMO", - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - ItemList.Machine_IV_ThermalCentrifuge.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", "OMO", "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + ItemList.Machine_IV_ThermalCentrifuge.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 385, "basicmachine.thermalcentrifuge.tier.05", "Blaze Sweatshop T-6350", @@ -6150,24 +4840,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "THERMAL_CENTRIFUGE", - new Object[] { - "CEC", - "OMO", - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_OreWasher.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", "OMO", "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE }).getStackForm(1L)); + + ItemList.Machine_LV_OreWasher.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 391, "basicmachine.orewasher.tier.01", "Basic Ore Washing Plant", @@ -6185,25 +4865,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ORE_WASHER", - new Object[] { - "RGR", - "CEC", - aTextWireHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP - }) - .getStackForm(1L)); - ItemList.Machine_MV_OreWasher.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "RGR", "CEC", aTextWireHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP }).getStackForm(1L)); + ItemList.Machine_MV_OreWasher.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 392, "basicmachine.orewasher.tier.02", "Advanced Ore Washing Plant", @@ -6221,25 +4891,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ORE_WASHER", - new Object[] { - "RGR", - "CEC", - aTextWireHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP - }) - .getStackForm(1L)); - ItemList.Machine_HV_OreWasher.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "RGR", "CEC", aTextWireHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP }).getStackForm(1L)); + ItemList.Machine_HV_OreWasher.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 393, "basicmachine.orewasher.tier.03", "Advanced Ore Washing Plant II", @@ -6257,25 +4917,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ORE_WASHER", - new Object[] { - "RGR", - "CEC", - aTextWireHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP - }) - .getStackForm(1L)); - ItemList.Machine_EV_OreWasher.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "RGR", "CEC", aTextWireHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP }).getStackForm(1L)); + ItemList.Machine_EV_OreWasher.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 394, "basicmachine.orewasher.tier.04", "Advanced Ore Washing Plant III", @@ -6293,25 +4943,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ORE_WASHER", - new Object[] { - "RGR", - "CEC", - aTextWireHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP - }) - .getStackForm(1L)); - ItemList.Machine_IV_OreWasher.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "RGR", "CEC", aTextWireHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP }).getStackForm(1L)); + ItemList.Machine_IV_OreWasher.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 395, "basicmachine.orewasher.tier.05", "Repurposed Laundry-Washer I-360", @@ -6329,24 +4969,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ORE_WASHER", - new Object[] { - "RGR", - "CEC", - aTextWireHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP - }) - .getStackForm(1L)); + new Object[] { "RGR", "CEC", aTextWireHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP }).getStackForm(1L)); ItemList.Machine_LV_Boxinator.set( new GT_MetaTileEntity_Boxinator(401, "basicmachine.boxinator.tier.01", "Basic Packager", 1) @@ -6373,144 +5002,57 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_Boxinator(408, "basicmachine.boxinator.tier.08", "Boxinator", 8) .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Boxinator.get(1L), bitsd, new Object[] { - "BCB", - "RMV", - aTextWireCoil, - 'M', - ItemList.Hull_LV, - 'R', - ItemList.Robot_Arm_LV, - 'V', - ItemList.Conveyor_Module_LV, - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin), - 'B', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Boxinator.get(1L), bitsd, new Object[] { - "BCB", - "RMV", - aTextWireCoil, - 'M', - ItemList.Hull_MV, - 'R', - ItemList.Robot_Arm_MV, - 'V', - ItemList.Conveyor_Module_MV, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt01.get(Materials.AnyCopper), - 'B', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Boxinator.get(1L), bitsd, new Object[] { - "BCB", - "RMV", - aTextWireCoil, - 'M', - ItemList.Hull_HV, - 'R', - ItemList.Robot_Arm_HV, - 'V', - ItemList.Conveyor_Module_HV, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold), - 'B', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Boxinator.get(1L), bitsd, new Object[] { - "BCB", - "RMV", - aTextWireCoil, - 'M', - ItemList.Hull_EV, - 'R', - ItemList.Robot_Arm_EV, - 'V', - ItemList.Conveyor_Module_EV, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt01.get(Materials.Aluminium), - 'B', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Boxinator.get(1L), bitsd, new Object[] { - "BCB", - "RMV", - aTextWireCoil, - 'M', - ItemList.Hull_IV, - 'R', - ItemList.Robot_Arm_IV, - 'V', - ItemList.Conveyor_Module_IV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt01.get(Materials.Tungsten), - 'B', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Boxinator.get(1L), bitsd, new Object[] { - "BCB", - "RMV", - aTextWireCoil, - 'M', - ItemList.Hull_LuV, - 'R', - ItemList.Robot_Arm_LuV, - 'V', - ItemList.Conveyor_Module_LuV, - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'W', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium), - 'B', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Boxinator.get(1L), bitsd, new Object[] { - "BCB", - "RMV", - aTextWireCoil, - 'M', - ItemList.Hull_ZPM, - 'R', - ItemList.Robot_Arm_ZPM, - 'V', - ItemList.Conveyor_Module_ZPM, - 'C', - OrePrefixes.circuit.get(Materials.Ultimate), - 'W', - OrePrefixes.cableGt01.get(Materials.Naquadah), - 'B', - OreDictNames.craftingChest - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Boxinator.get(1L), bitsd, new Object[] { - "BCB", - "RMV", - aTextWireCoil, - 'M', - ItemList.Hull_UV, - 'R', - ItemList.Robot_Arm_UV, - 'V', - ItemList.Conveyor_Module_UV, - 'C', - OrePrefixes.circuit.get(Materials.SuperconductorUHV), - 'W', - OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), - 'B', - OreDictNames.craftingChest - }); - - ItemList.Machine_LV_Unboxinator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_LV_Boxinator.get(1L), + bitsd, + new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_LV, 'R', ItemList.Robot_Arm_LV, 'V', + ItemList.Conveyor_Module_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.cableGt01.get(Materials.Tin), 'B', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_MV_Boxinator.get(1L), + bitsd, + new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_MV, 'R', ItemList.Robot_Arm_MV, 'V', + ItemList.Conveyor_Module_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.cableGt01.get(Materials.AnyCopper), 'B', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HV_Boxinator.get(1L), + bitsd, + new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_HV, 'R', ItemList.Robot_Arm_HV, 'V', + ItemList.Conveyor_Module_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.cableGt01.get(Materials.Gold), 'B', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_EV_Boxinator.get(1L), + bitsd, + new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_EV, 'R', ItemList.Robot_Arm_EV, 'V', + ItemList.Conveyor_Module_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + OrePrefixes.cableGt01.get(Materials.Aluminium), 'B', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_IV_Boxinator.get(1L), + bitsd, + new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_IV, 'R', ItemList.Robot_Arm_IV, 'V', + ItemList.Conveyor_Module_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.cableGt01.get(Materials.Tungsten), 'B', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_LuV_Boxinator.get(1L), + bitsd, + new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_LuV, 'R', ItemList.Robot_Arm_LuV, 'V', + ItemList.Conveyor_Module_LuV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', + OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'B', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_ZPM_Boxinator.get(1L), + bitsd, + new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'R', ItemList.Robot_Arm_ZPM, 'V', + ItemList.Conveyor_Module_ZPM, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', + OrePrefixes.cableGt01.get(Materials.Naquadah), 'B', OreDictNames.craftingChest }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_UV_Boxinator.get(1L), + bitsd, + new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_UV, 'R', ItemList.Robot_Arm_UV, 'V', + ItemList.Conveyor_Module_UV, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'W', + OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'B', OreDictNames.craftingChest }); + + ItemList.Machine_LV_Unboxinator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 411, "basicmachine.unboxinator.tier.01", "Basic Unpackager", @@ -6528,25 +5070,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "UNBOXINATOR", - new Object[] { - "BCB", - "VMR", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_MV_Unboxinator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "BCB", "VMR", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_MV_Unboxinator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 412, "basicmachine.unboxinator.tier.02", "Advanced Unpackager", @@ -6564,25 +5096,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "UNBOXINATOR", - new Object[] { - "BCB", - "VMR", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_HV_Unboxinator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "BCB", "VMR", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_HV_Unboxinator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 413, "basicmachine.unboxinator.tier.03", "Advanced Unpackager II", @@ -6600,25 +5122,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "UNBOXINATOR", - new Object[] { - "BCB", - "VMR", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_EV_Unboxinator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "BCB", "VMR", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_EV_Unboxinator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 414, "basicmachine.unboxinator.tier.04", "Advanced Unpackager III", @@ -6636,25 +5148,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "UNBOXINATOR", - new Object[] { - "BCB", - "VMR", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_IV_Unboxinator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "BCB", "VMR", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_IV_Unboxinator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 415, "basicmachine.unboxinator.tier.05", "Unboxinator", @@ -6672,25 +5174,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "UNBOXINATOR", - new Object[] { - "BCB", - "VMR", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_LuV_Unboxinator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "BCB", "VMR", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_LuV_Unboxinator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 416, "basicmachine.unboxinator.tier.06", "Unboxinator", @@ -6708,25 +5200,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "UNBOXINATOR", - new Object[] { - "BCB", - "VMR", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_ZPM_Unboxinator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "BCB", "VMR", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_ZPM_Unboxinator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 417, "basicmachine.unboxinator.tier.07", "Unboxinator", @@ -6744,25 +5226,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "UNBOXINATOR", - new Object[] { - "BCB", - "VMR", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_UV_Unboxinator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "BCB", "VMR", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_UV_Unboxinator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 418, "basicmachine.unboxinator.tier.08", "Unboxinator", @@ -6780,26 +5252,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "UNBOXINATOR", - new Object[] { - "BCB", - "VMR", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - - ItemList.Machine_LV_ChemicalReactor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "BCB", "VMR", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + + ItemList.Machine_LV_ChemicalReactor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 421, "basicmachine.chemicalreactor.tier.01", "Basic Chemical Reactor", @@ -6817,25 +5279,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CHEMICAL_REACTOR", - new Object[] { - "GRG", - "WEW", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_ChemicalReactor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GRG", "WEW", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_ChemicalReactor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 422, "basicmachine.chemicalreactor.tier.02", "Advanced Chemical Reactor", @@ -6853,25 +5305,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CHEMICAL_REACTOR", - new Object[] { - "GRG", - "WEW", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_ChemicalReactor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GRG", "WEW", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_ChemicalReactor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 423, "basicmachine.chemicalreactor.tier.03", "Advanced Chemical Reactor II", @@ -6889,25 +5331,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CHEMICAL_REACTOR", - new Object[] { - "GRG", - "WEW", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OrePrefixes.pipeMedium.get(Materials.Plastic) - }) - .getStackForm(1L)); - ItemList.Machine_EV_ChemicalReactor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GRG", "WEW", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + OrePrefixes.pipeMedium.get(Materials.Plastic) }).getStackForm(1L)); + ItemList.Machine_EV_ChemicalReactor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 424, "basicmachine.chemicalreactor.tier.04", "Advanced Chemical Reactor III", @@ -6925,25 +5357,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CHEMICAL_REACTOR", - new Object[] { - "GRG", - "WEW", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OrePrefixes.pipeLarge.get(Materials.Plastic) - }) - .getStackForm(1L)); - ItemList.Machine_IV_ChemicalReactor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GRG", "WEW", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + OrePrefixes.pipeLarge.get(Materials.Plastic) }).getStackForm(1L)); + ItemList.Machine_IV_ChemicalReactor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 425, "basicmachine.chemicalreactor.tier.05", "Advanced Chemical Reactor IV", @@ -6961,26 +5383,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CHEMICAL_REACTOR", - new Object[] { - "GRG", - "WEW", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - OrePrefixes.pipeHuge.get(Materials.Plastic) - }) - .getStackForm(1L)); - - ItemList.Machine_LV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GRG", "WEW", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + OrePrefixes.pipeHuge.get(Materials.Plastic) }).getStackForm(1L)); + + ItemList.Machine_LV_FluidCanner.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 431, "basicmachine.fluidcanner.tier.01", "Basic Fluid Canner", @@ -6998,23 +5410,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_CANNER", - new Object[] { - "GCG", - "GMG", - "WPW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_FluidCanner.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 432, "basicmachine.fluidcanner.tier.02", "Advanced Fluid Canner", @@ -7032,23 +5434,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_CANNER", - new Object[] { - "GCG", - "GMG", - "WPW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_FluidCanner.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 433, "basicmachine.fluidcanner.tier.03", "Quick Fluid Canner", @@ -7066,23 +5458,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_CANNER", - new Object[] { - "GCG", - "GMG", - "WPW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_FluidCanner.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 434, "basicmachine.fluidcanner.tier.04", "Turbo Fluid Canner", @@ -7100,23 +5482,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_CANNER", - new Object[] { - "GCG", - "GMG", - "WPW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_FluidCanner.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 435, "basicmachine.fluidcanner.tier.05", "Instant Fluid Canner", @@ -7134,22 +5506,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_CANNER", - new Object[] { - "GCG", - "GMG", - "WPW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); + new Object[] { "GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); ItemList.Machine_LV_RockBreaker.set( new GT_MetaTileEntity_RockBreaker(441, "basicmachine.rockbreaker.tier.01", "Basic Rock Breaker", 1) @@ -7157,111 +5518,60 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Machine_MV_RockBreaker.set( new GT_MetaTileEntity_RockBreaker(442, "basicmachine.rockbreaker.tier.02", "Advanced Rock Breaker", 2) .getStackForm(1L)); - ItemList.Machine_HV_RockBreaker.set(new GT_MetaTileEntity_RockBreaker( - 443, "basicmachine.rockbreaker.tier.03", "Advanced Rock Breaker II", 3) - .getStackForm(1L)); - ItemList.Machine_EV_RockBreaker.set(new GT_MetaTileEntity_RockBreaker( - 444, "basicmachine.rockbreaker.tier.04", "Advanced Rock Breaker III", 4) - .getStackForm(1L)); - ItemList.Machine_IV_RockBreaker.set(new GT_MetaTileEntity_RockBreaker( - 445, "basicmachine.rockbreaker.tier.05", "Cryogenic Magma Solidifier R-8200", 5) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_RockBreaker.get(1L), bitsd, new Object[] { - "PED", - aTextWireHull, - "GGG", - 'M', - ItemList.Hull_LV, - 'D', - OreDictNames.craftingGrinder, - 'E', - ItemList.Electric_Motor_LV, - 'P', - ItemList.Electric_Piston_LV, - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin), - 'G', - new ItemStack(Blocks.glass, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_RockBreaker.get(1L), bitsd, new Object[] { - "PED", - aTextWireHull, - "GGG", - 'M', - ItemList.Hull_MV, - 'D', - OreDictNames.craftingGrinder, - 'E', - ItemList.Electric_Motor_MV, - 'P', - ItemList.Electric_Piston_MV, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt01.get(Materials.AnyCopper), - 'G', - new ItemStack(Blocks.glass, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_RockBreaker.get(1L), bitsd, new Object[] { - "PED", - aTextWireHull, - "GGG", - 'M', - ItemList.Hull_HV, - 'D', - OreDictNames.craftingGrinder, - 'E', - ItemList.Electric_Motor_HV, - 'P', - ItemList.Electric_Piston_HV, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold), - 'G', - new ItemStack(Blocks.glass, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_RockBreaker.get(1L), bitsd, new Object[] { - "PED", - aTextWireHull, - "GGG", - 'M', - ItemList.Hull_EV, - 'D', - OreDictNames.craftingGrinder, - 'E', - ItemList.Electric_Motor_EV, - 'P', - ItemList.Electric_Piston_EV, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt01.get(Materials.Aluminium), - 'G', - new ItemStack(Blocks.glass, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_RockBreaker.get(1L), bitsd, new Object[] { - "PED", - aTextWireHull, - "GGG", - 'M', - ItemList.Hull_IV, - 'D', - OreDictNames.craftingGrinder, - 'E', - ItemList.Electric_Motor_IV, - 'P', - ItemList.Electric_Piston_IV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt01.get(Materials.Tungsten), - 'G', - new ItemStack(Blocks.glass, 1) - }); + ItemList.Machine_HV_RockBreaker.set( + new GT_MetaTileEntity_RockBreaker( + 443, + "basicmachine.rockbreaker.tier.03", + "Advanced Rock Breaker II", + 3).getStackForm(1L)); + ItemList.Machine_EV_RockBreaker.set( + new GT_MetaTileEntity_RockBreaker( + 444, + "basicmachine.rockbreaker.tier.04", + "Advanced Rock Breaker III", + 4).getStackForm(1L)); + ItemList.Machine_IV_RockBreaker.set( + new GT_MetaTileEntity_RockBreaker( + 445, + "basicmachine.rockbreaker.tier.05", + "Cryogenic Magma Solidifier R-8200", + 5).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_LV_RockBreaker.get(1L), + bitsd, + new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_LV, 'D', OreDictNames.craftingGrinder, + 'E', ItemList.Electric_Motor_LV, 'P', ItemList.Electric_Piston_LV, 'C', + OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', + new ItemStack(Blocks.glass, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_MV_RockBreaker.get(1L), + bitsd, + new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_MV, 'D', OreDictNames.craftingGrinder, + 'E', ItemList.Electric_Motor_MV, 'P', ItemList.Electric_Piston_MV, 'C', + OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), + 'G', new ItemStack(Blocks.glass, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HV_RockBreaker.get(1L), + bitsd, + new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_HV, 'D', OreDictNames.craftingGrinder, + 'E', ItemList.Electric_Motor_HV, 'P', ItemList.Electric_Piston_HV, 'C', + OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), + 'G', new ItemStack(Blocks.glass, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_EV_RockBreaker.get(1L), + bitsd, + new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_EV, 'D', OreDictNames.craftingGrinder, + 'E', ItemList.Electric_Motor_EV, 'P', ItemList.Electric_Piston_EV, 'C', + OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), + 'G', new ItemStack(Blocks.glass, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_IV_RockBreaker.get(1L), + bitsd, + new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_IV, 'D', OreDictNames.craftingGrinder, + 'E', ItemList.Electric_Motor_IV, 'P', ItemList.Electric_Piston_IV, 'C', + OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), + 'G', new ItemStack(Blocks.glass, 1) }); ItemList.Machine_LV_Disassembler.set( new GT_MetaTileEntity_Disassembler(451, "basicmachine.disassembler.tier.01", "Basic Disassembler", 1) @@ -7269,158 +5579,130 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Machine_MV_Disassembler.set( new GT_MetaTileEntity_Disassembler(452, "basicmachine.disassembler.tier.02", "Advanced Disassembler", 2) .getStackForm(1L)); - ItemList.Machine_HV_Disassembler.set(new GT_MetaTileEntity_Disassembler( - 453, "basicmachine.disassembler.tier.03", "Advanced Disassembler II", 3) - .getStackForm(1L)); - ItemList.Machine_EV_Disassembler.set(new GT_MetaTileEntity_Disassembler( - 454, "basicmachine.disassembler.tier.04", "Advanced Disassembler III", 4) - .getStackForm(1L)); - ItemList.Machine_IV_Disassembler.set(new GT_MetaTileEntity_Disassembler( - 455, "basicmachine.disassembler.tier.05", "Advanced Disassembler IV", 5) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Disassembler.get(1L), bitsd, new Object[] { - "ACA", - aTextWireHull, - "ACA", - 'M', - ItemList.Hull_LV, - 'A', - ItemList.Robot_Arm_LV, - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Disassembler.get(1L), bitsd, new Object[] { - "ACA", - aTextWireHull, - "ACA", - 'M', - ItemList.Hull_MV, - 'A', - ItemList.Robot_Arm_MV, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt01.get(Materials.AnyCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Disassembler.get(1L), bitsd, new Object[] { - "ACA", - aTextWireHull, - "ACA", - 'M', - ItemList.Hull_HV, - 'A', - ItemList.Robot_Arm_HV, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Disassembler.get(1L), bitsd, new Object[] { - "ACA", - aTextWireHull, - "ACA", - 'M', - ItemList.Hull_EV, - 'A', - ItemList.Robot_Arm_EV, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt01.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Disassembler.get(1L), bitsd, new Object[] { - "ACA", - aTextWireHull, - "ACA", - 'M', - ItemList.Hull_IV, - 'A', - ItemList.Robot_Arm_IV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt01.get(Materials.Tungsten) - }); + ItemList.Machine_HV_Disassembler.set( + new GT_MetaTileEntity_Disassembler( + 453, + "basicmachine.disassembler.tier.03", + "Advanced Disassembler II", + 3).getStackForm(1L)); + ItemList.Machine_EV_Disassembler.set( + new GT_MetaTileEntity_Disassembler( + 454, + "basicmachine.disassembler.tier.04", + "Advanced Disassembler III", + 4).getStackForm(1L)); + ItemList.Machine_IV_Disassembler.set( + new GT_MetaTileEntity_Disassembler( + 455, + "basicmachine.disassembler.tier.05", + "Advanced Disassembler IV", + 5).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_LV_Disassembler.get(1L), + bitsd, + new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_LV, 'A', ItemList.Robot_Arm_LV, 'C', + OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_MV_Disassembler.get(1L), + bitsd, + new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_MV, 'A', ItemList.Robot_Arm_MV, 'C', + OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HV_Disassembler.get(1L), + bitsd, + new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_HV, 'A', ItemList.Robot_Arm_HV, 'C', + OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_EV_Disassembler.get(1L), + bitsd, + new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_EV, 'A', ItemList.Robot_Arm_EV, 'C', + OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_IV_Disassembler.get(1L), + bitsd, + new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_IV, 'A', ItemList.Robot_Arm_IV, 'C', + OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten) }); if (Loader.isModLoaded("Forestry")) { - ItemList.Machine_IndustrialApiary.set(new GT_MetaTileEntity_IndustrialApiary( - 9399, "basicmachine.industrialapiary", "Industrial Apiary", 8) - .getStackForm(1L)); + ItemList.Machine_IndustrialApiary.set( + new GT_MetaTileEntity_IndustrialApiary( + 9399, + "basicmachine.industrialapiary", + "Industrial Apiary", + 8).getStackForm(1L)); /* Conversion recipes */ if (Loader.isModLoaded("gendustry")) { GT_ModHandler.addShapelessCraftingRecipe( ItemList.Machine_IndustrialApiary.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "IndustrialApiary", 1, 0)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "IndustrialApiary", 1, 0) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_Frame.get(1), - new Object[] {GT_ModHandler.getModItem("gendustry", "UpgradeFrame", 1)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "UpgradeFrame", 1) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_PRODUCTION.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 0)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 0) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_PLAINS.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 17)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 17) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_LIGHT.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 11)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 11) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_FLOWERING.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 2)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 2) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_WINTER.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 20)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 20) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_DRYER.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 5)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 5) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_AUTOMATION.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 14)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 14) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_HUMIDIFIER.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 4)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 4) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_HELL.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 13)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 13) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_POLLEN.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 22)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 22) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_DESERT.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 16)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 16) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_COOLER.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 7)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 7) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_LIFESPAN.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 1)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 1) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_SEAL.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 10)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 10) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_STABILIZER.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 19)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 19) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_JUNGLE.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 18)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 18) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_TERRITORY.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 3)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 3) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_OCEAN.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 21)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 21) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_SKY.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 12)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 12) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_HEATER.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 6)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 6) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_SIEVE.get(1L), - new Object[] {GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 15)}); + new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 15) }); } } @@ -7430,83 +5712,56 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Machine_MV_Massfab.set( new GT_MetaTileEntity_Massfabricator(462, "basicmachine.massfab.tier.02", "Advanced Mass Fabricator", 2) .getStackForm(1L)); - ItemList.Machine_HV_Massfab.set(new GT_MetaTileEntity_Massfabricator( - 463, "basicmachine.massfab.tier.03", "Advanced Mass Fabricator II", 3) - .getStackForm(1L)); - ItemList.Machine_EV_Massfab.set(new GT_MetaTileEntity_Massfabricator( - 464, "basicmachine.massfab.tier.04", "Advanced Mass Fabricator III", 4) - .getStackForm(1L)); - ItemList.Machine_IV_Massfab.set(new GT_MetaTileEntity_Massfabricator( - 465, "basicmachine.massfab.tier.05", "Advanced Mass Fabricator IV", 5) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Massfab.get(1L), bitsd, new Object[] { - "CFC", - aTextWireHull, - "CFC", - 'M', - ItemList.Hull_LV, - 'F', - ItemList.Field_Generator_LV, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt04.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Massfab.get(1L), bitsd, new Object[] { - "CFC", - aTextWireHull, - "CFC", - 'M', - ItemList.Hull_MV, - 'F', - ItemList.Field_Generator_MV, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt04.get(Materials.AnyCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Massfab.get(1L), bitsd, new Object[] { - "CFC", - aTextWireHull, - "CFC", - 'M', - ItemList.Hull_HV, - 'F', - ItemList.Field_Generator_HV, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt04.get(Materials.Gold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Massfab.get(1L), bitsd, new Object[] { - "CFC", - aTextWireHull, - "CFC", - 'M', - ItemList.Hull_EV, - 'F', - ItemList.Field_Generator_EV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt04.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Massfab.get(1L), bitsd, new Object[] { - "CFC", - aTextWireHull, - "CFC", - 'M', - ItemList.Hull_IV, - 'F', - ItemList.Field_Generator_IV, - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'W', - OrePrefixes.cableGt04.get(Materials.Tungsten) - }); - - ItemList.Machine_LV_Amplifab.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ItemList.Machine_HV_Massfab.set( + new GT_MetaTileEntity_Massfabricator( + 463, + "basicmachine.massfab.tier.03", + "Advanced Mass Fabricator II", + 3).getStackForm(1L)); + ItemList.Machine_EV_Massfab.set( + new GT_MetaTileEntity_Massfabricator( + 464, + "basicmachine.massfab.tier.04", + "Advanced Mass Fabricator III", + 4).getStackForm(1L)); + ItemList.Machine_IV_Massfab.set( + new GT_MetaTileEntity_Massfabricator( + 465, + "basicmachine.massfab.tier.05", + "Advanced Mass Fabricator IV", + 5).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_LV_Massfab.get(1L), + bitsd, + new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_LV, 'F', ItemList.Field_Generator_LV, + 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt04.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_MV_Massfab.get(1L), + bitsd, + new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_MV, 'F', ItemList.Field_Generator_MV, + 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.cableGt04.get(Materials.AnyCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HV_Massfab.get(1L), + bitsd, + new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_HV, 'F', ItemList.Field_Generator_HV, + 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt04.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_EV_Massfab.get(1L), + bitsd, + new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, + 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.cableGt04.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_IV_Massfab.get(1L), + bitsd, + new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, + 'C', OrePrefixes.circuit.get(Materials.Master), 'W', + OrePrefixes.cableGt04.get(Materials.Tungsten) }); + + ItemList.Machine_LV_Amplifab.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 471, "basicmachine.amplifab.tier.01", "Basic Amplifabricator", @@ -7524,21 +5779,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "AMPLIFAB", - new Object[] { - aTextWirePump, - aTextPlateMotor, - "CPC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - ItemList.Machine_MV_Amplifab.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + ItemList.Machine_MV_Amplifab.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 472, "basicmachine.amplifab.tier.02", "Advanced Amplifabricator", @@ -7556,21 +5803,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "AMPLIFAB", - new Object[] { - aTextWirePump, - aTextPlateMotor, - "CPC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - ItemList.Machine_HV_Amplifab.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + ItemList.Machine_HV_Amplifab.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 473, "basicmachine.amplifab.tier.03", "Advanced Amplifabricator II", @@ -7588,21 +5827,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "AMPLIFAB", - new Object[] { - aTextWirePump, - aTextPlateMotor, - "CPC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - ItemList.Machine_EV_Amplifab.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + ItemList.Machine_EV_Amplifab.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 474, "basicmachine.amplifab.tier.04", "Advanced Amplifabricator III", @@ -7620,21 +5851,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "AMPLIFAB", - new Object[] { - aTextWirePump, - aTextPlateMotor, - "CPC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - ItemList.Machine_IV_Amplifab.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + ItemList.Machine_IV_Amplifab.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 475, "basicmachine.amplifab.tier.05", "Advanced Amplifabricator IV", @@ -7652,20 +5875,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "AMPLIFAB", - new Object[] { - aTextWirePump, - aTextPlateMotor, - "CPC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); + new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); ItemList.Machine_LV_Replicator.set( new GT_MetaTileEntity_Replicator(481, "basicmachine.replicator.tier.01", "Basic Replicator", 1) @@ -7683,81 +5897,39 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_Replicator(485, "basicmachine.replicator.tier.05", "Advanced Replicator IV", 5) .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Replicator.get(1L), bitsd, new Object[] { - "EFE", - aTextCableHull, - aTextMotorWire, - 'M', - ItemList.Hull_LV, - 'F', - ItemList.Field_Generator_LV, - 'E', - ItemList.Emitter_LV, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt04.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Replicator.get(1L), bitsd, new Object[] { - "EFE", - aTextCableHull, - aTextMotorWire, - 'M', - ItemList.Hull_MV, - 'F', - ItemList.Field_Generator_MV, - 'E', - ItemList.Emitter_MV, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt04.get(Materials.AnyCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Replicator.get(1L), bitsd, new Object[] { - "EFE", - aTextCableHull, - aTextMotorWire, - 'M', - ItemList.Hull_HV, - 'F', - ItemList.Field_Generator_HV, - 'E', - ItemList.Emitter_HV, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt04.get(Materials.Gold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Replicator.get(1L), bitsd, new Object[] { - "EFE", - aTextCableHull, - aTextMotorWire, - 'M', - ItemList.Hull_EV, - 'F', - ItemList.Field_Generator_EV, - 'E', - ItemList.Emitter_EV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt04.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Replicator.get(1L), bitsd, new Object[] { - "EFE", - aTextCableHull, - aTextMotorWire, - 'M', - ItemList.Hull_IV, - 'F', - ItemList.Field_Generator_IV, - 'E', - ItemList.Emitter_IV, - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'W', - OrePrefixes.cableGt04.get(Materials.Tungsten) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_LV_Replicator.get(1L), + bitsd, + new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LV, 'F', + ItemList.Field_Generator_LV, 'E', ItemList.Emitter_LV, 'C', + OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt04.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_MV_Replicator.get(1L), + bitsd, + new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_MV, 'F', + ItemList.Field_Generator_MV, 'E', ItemList.Emitter_MV, 'C', + OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.cableGt04.get(Materials.AnyCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HV_Replicator.get(1L), + bitsd, + new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_HV, 'F', + ItemList.Field_Generator_HV, 'E', ItemList.Emitter_HV, 'C', + OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt04.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_EV_Replicator.get(1L), + bitsd, + new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_EV, 'F', + ItemList.Field_Generator_EV, 'E', ItemList.Emitter_EV, 'C', + OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.cableGt04.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_IV_Replicator.get(1L), + bitsd, + new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_IV, 'F', + ItemList.Field_Generator_IV, 'E', ItemList.Emitter_IV, 'C', + OrePrefixes.circuit.get(Materials.Master), 'W', + OrePrefixes.cableGt04.get(Materials.Tungsten) }); ItemList.Machine_LV_Brewery.set( new GT_MetaTileEntity_PotionBrewer(491, "basicmachine.brewery.tier.01", "Basic Brewery", 1) @@ -7775,93 +5947,39 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_PotionBrewer(495, "basicmachine.brewery.tier.05", "Advanced Brewery IV", 5) .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Brewery.get(1L), bitsd, new Object[] { - "GPG", - aTextWireHull, - "CBC", - 'M', - ItemList.Hull_LV, - 'P', - ItemList.Electric_Pump_LV, - 'B', - new ItemStack(Items.brewing_stand, 0), - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin), - 'G', - new ItemStack(Blocks.glass, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Brewery.get(1L), bitsd, new Object[] { - "GPG", - aTextWireHull, - "CBC", - 'M', - ItemList.Hull_MV, - 'P', - ItemList.Electric_Pump_MV, - 'B', - new ItemStack(Items.brewing_stand, 0), - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt01.get(Materials.AnyCopper), - 'G', - new ItemStack(Blocks.glass, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Brewery.get(1L), bitsd, new Object[] { - "GPG", - aTextWireHull, - "CBC", - 'M', - ItemList.Hull_HV, - 'P', - ItemList.Electric_Pump_HV, - 'B', - new ItemStack(Items.brewing_stand, 0), - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold), - 'G', - new ItemStack(Blocks.glass, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Brewery.get(1L), bitsd, new Object[] { - "GPG", - aTextWireHull, - "CBC", - 'M', - ItemList.Hull_EV, - 'P', - ItemList.Electric_Pump_EV, - 'B', - new ItemStack(Items.brewing_stand, 0), - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt01.get(Materials.Aluminium), - 'G', - new ItemStack(Blocks.glass, 1) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Brewery.get(1L), bitsd, new Object[] { - "GPG", - aTextWireHull, - "CBC", - 'M', - ItemList.Hull_IV, - 'P', - ItemList.Electric_Pump_IV, - 'B', - new ItemStack(Items.brewing_stand, 0), - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt01.get(Materials.Tungsten), - 'G', - new ItemStack(Blocks.glass, 1) - }); - - ItemList.Machine_LV_Fermenter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_LV_Brewery.get(1L), + bitsd, + new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Pump_LV, 'B', + new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.cableGt01.get(Materials.Tin), 'G', new ItemStack(Blocks.glass, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_MV_Brewery.get(1L), + bitsd, + new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Pump_MV, 'B', + new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', new ItemStack(Blocks.glass, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HV_Brewery.get(1L), + bitsd, + new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Pump_HV, 'B', + new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.cableGt01.get(Materials.Gold), 'G', new ItemStack(Blocks.glass, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_EV_Brewery.get(1L), + bitsd, + new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Pump_EV, 'B', + new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', new ItemStack(Blocks.glass, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_IV_Brewery.get(1L), + bitsd, + new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Pump_IV, 'B', + new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', new ItemStack(Blocks.glass, 1) }); + + ItemList.Machine_LV_Fermenter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 501, "basicmachine.fermenter.tier.01", "Basic Fermenter", @@ -7879,23 +5997,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FERMENTER", - new Object[] { - aTextWirePump, - "GMG", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_Fermenter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_Fermenter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 502, "basicmachine.fermenter.tier.02", "Advanced Fermenter", @@ -7913,23 +6022,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FERMENTER", - new Object[] { - aTextWirePump, - "GMG", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_Fermenter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_Fermenter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 503, "basicmachine.fermenter.tier.03", "Advanced Fermenter II", @@ -7947,23 +6047,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FERMENTER", - new Object[] { - aTextWirePump, - "GMG", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_Fermenter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_Fermenter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 504, "basicmachine.fermenter.tier.04", "Advanced Fermenter III", @@ -7981,23 +6072,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FERMENTER", - new Object[] { - aTextWirePump, - "GMG", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_Fermenter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_Fermenter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 505, "basicmachine.fermenter.tier.05", "Advanced Fermenter IV", @@ -8015,24 +6097,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FERMENTER", - new Object[] { - aTextWirePump, - "GMG", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - - ItemList.Machine_LV_FluidExtractor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + + ItemList.Machine_LV_FluidExtractor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 511, "basicmachine.fluidextractor.tier.01", "Basic Fluid Extractor", @@ -8050,25 +6123,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_EXTRACTOR", - new Object[] { - "GEG", - "TPT", - "CMC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'T', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_FluidExtractor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GEG", "TPT", "CMC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'T', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_FluidExtractor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 512, "basicmachine.fluidextractor.tier.02", "Advanced Fluid Extractor", @@ -8086,25 +6148,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_EXTRACTOR", - new Object[] { - "GEG", - "TPT", - "CMC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'T', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_FluidExtractor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GEG", "TPT", "CMC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'T', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_FluidExtractor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 513, "basicmachine.fluidextractor.tier.03", "Advanced Fluid Extractor II", @@ -8122,25 +6173,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_EXTRACTOR", - new Object[] { - "GEG", - "TPT", - "CMC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'T', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_FluidExtractor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GEG", "TPT", "CMC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'T', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_FluidExtractor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 514, "basicmachine.fluidextractor.tier.04", "Advanced Fluid Extractor III", @@ -8158,25 +6198,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_EXTRACTOR", - new Object[] { - "GEG", - "TPT", - "CMC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'T', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_FluidExtractor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GEG", "TPT", "CMC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'T', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_FluidExtractor.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 515, "basicmachine.fluidextractor.tier.05", "Advanced Fluid Extractor IV", @@ -8194,26 +6223,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_EXTRACTOR", - new Object[] { - "GEG", - "TPT", - "CMC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'T', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - - ItemList.Machine_LV_FluidSolidifier.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GEG", "TPT", "CMC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'T', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + + ItemList.Machine_LV_FluidSolidifier.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 521, "basicmachine.fluidsolidifier.tier.01", "Basic Fluid Solidifier", @@ -8231,25 +6249,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_SOLIDIFIER", - new Object[] { - "PGP", - aTextWireHull, - "CBC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_MV_FluidSolidifier.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PGP", aTextWireHull, "CBC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_MV_FluidSolidifier.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 522, "basicmachine.fluidsolidifier.tier.02", "Advanced Fluid Solidifier", @@ -8267,25 +6275,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_SOLIDIFIER", - new Object[] { - "PGP", - aTextWireHull, - "CBC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_HV_FluidSolidifier.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PGP", aTextWireHull, "CBC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_HV_FluidSolidifier.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 523, "basicmachine.fluidsolidifier.tier.03", "Advanced Fluid Solidifier II", @@ -8303,25 +6301,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_SOLIDIFIER", - new Object[] { - "PGP", - aTextWireHull, - "CBC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_EV_FluidSolidifier.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PGP", aTextWireHull, "CBC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_EV_FluidSolidifier.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 524, "basicmachine.fluidsolidifier.tier.04", "Advanced Fluid Solidifier III", @@ -8339,25 +6327,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_SOLIDIFIER", - new Object[] { - "PGP", - aTextWireHull, - "CBC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - ItemList.Machine_IV_FluidSolidifier.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PGP", aTextWireHull, "CBC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + ItemList.Machine_IV_FluidSolidifier.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 525, "basicmachine.fluidsolidifier.tier.05", "Advanced Fluid Solidifier IV", @@ -8375,26 +6353,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_SOLIDIFIER", - new Object[] { - "PGP", - aTextWireHull, - "CBC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, - 'B', - OreDictNames.craftingChest - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Distillery.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PGP", aTextWireHull, "CBC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingChest }) + .getStackForm(1L)); + + ItemList.Machine_LV_Distillery.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 531, "basicmachine.distillery.tier.01", "Basic Distillery", @@ -8412,25 +6380,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "DISTILLERY", - new Object[] { - "GBG", - aTextCableHull, - aTextWirePump, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'B', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_Distillery.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'B', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_Distillery.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 532, "basicmachine.distillery.tier.02", "Advanced Distillery", @@ -8448,25 +6406,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "DISTILLERY", - new Object[] { - "GBG", - aTextCableHull, - aTextWirePump, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'B', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_Distillery.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'B', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_Distillery.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 533, "basicmachine.distillery.tier.03", "Advanced Distillery II", @@ -8484,25 +6432,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "DISTILLERY", - new Object[] { - "GBG", - aTextCableHull, - aTextWirePump, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'B', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_Distillery.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'B', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_Distillery.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 534, "basicmachine.distillery.tier.04", "Advanced Distillery III", @@ -8520,25 +6458,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "DISTILLERY", - new Object[] { - "GBG", - aTextCableHull, - aTextWirePump, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'B', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_Distillery.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'B', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_Distillery.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 535, "basicmachine.distillery.tier.05", "Advanced Distillery IV", @@ -8556,26 +6484,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "DISTILLERY", - new Object[] { - "GBG", - aTextCableHull, - aTextWirePump, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'B', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - - ItemList.Machine_LV_ChemicalBath.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'B', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + + ItemList.Machine_LV_ChemicalBath.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 541, "basicmachine.chemicalbath.tier.01", "Basic Chemical Bath", @@ -8593,25 +6511,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC true, SpecialEffects.NONE, "CHEMICAL_BATH", - new Object[] { - "VGW", - "PGV", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_ChemicalBath.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "VGW", "PGV", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_ChemicalBath.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 542, "basicmachine.chemicalbath.tier.02", "Advanced Chemical Bath", @@ -8629,25 +6537,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC true, SpecialEffects.NONE, "CHEMICAL_BATH", - new Object[] { - "VGW", - "PGV", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_ChemicalBath.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "VGW", "PGV", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_ChemicalBath.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 543, "basicmachine.chemicalbath.tier.03", "Advanced Chemical Bath II", @@ -8665,25 +6563,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC true, SpecialEffects.NONE, "CHEMICAL_BATH", - new Object[] { - "VGW", - "PGV", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_ChemicalBath.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "VGW", "PGV", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_ChemicalBath.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 544, "basicmachine.chemicalbath.tier.04", "Advanced Chemical Bath III", @@ -8701,25 +6589,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC true, SpecialEffects.NONE, "CHEMICAL_BATH", - new Object[] { - "VGW", - "PGV", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_ChemicalBath.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "VGW", "PGV", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_ChemicalBath.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 545, "basicmachine.chemicalbath.tier.05", "Advanced Chemical Bath IV", @@ -8737,26 +6615,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC true, SpecialEffects.NONE, "CHEMICAL_BATH", - new Object[] { - "VGW", - "PGV", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Polarizer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "VGW", "PGV", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + + ItemList.Machine_LV_Polarizer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 551, "basicmachine.polarizer.tier.01", "Basic Polarizer", @@ -8774,21 +6642,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "POLARIZER", - new Object[] { - "ZSZ", - aTextWireHull, - "ZSZ", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'S', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, - 'Z', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Polarizer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_Polarizer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 552, "basicmachine.polarizer.tier.02", "Advanced Polarizer", @@ -8806,21 +6666,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "POLARIZER", - new Object[] { - "ZSZ", - aTextWireHull, - "ZSZ", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'S', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, - 'Z', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Polarizer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_Polarizer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 553, "basicmachine.polarizer.tier.03", "Advanced Polarizer II", @@ -8838,21 +6690,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "POLARIZER", - new Object[] { - "ZSZ", - aTextWireHull, - "ZSZ", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'S', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, - 'Z', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Polarizer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_Polarizer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 554, "basicmachine.polarizer.tier.04", "Advanced Polarizer III", @@ -8870,21 +6714,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "POLARIZER", - new Object[] { - "ZSZ", - aTextWireHull, - "ZSZ", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'S', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, - 'Z', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Polarizer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_Polarizer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 555, "basicmachine.polarizer.tier.05", "Advanced Polarizer IV", @@ -8902,22 +6738,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "POLARIZER", - new Object[] { - "ZSZ", - aTextWireHull, - "ZSZ", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'S', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, - 'Z', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_ElectromagneticSeparator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_ElectromagneticSeparator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 561, "basicmachine.electromagneticseparator.tier.01", "Basic Electromagnetic Separator", @@ -8935,25 +6763,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", - new Object[] { - "VWZ", - "WMS", - "CWZ", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'S', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, - 'Z', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_ElectromagneticSeparator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "VWZ", "WMS", "CWZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_ElectromagneticSeparator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 562, "basicmachine.electromagneticseparator.tier.02", "Advanced Electromagnetic Separator", @@ -8971,25 +6788,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", - new Object[] { - "VWZ", - "WMS", - "CWZ", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'S', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, - 'Z', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_ElectromagneticSeparator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "VWZ", "WMS", "CWZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_ElectromagneticSeparator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 563, "basicmachine.electromagneticseparator.tier.03", "Advanced Electromagnetic Separator II", @@ -9007,25 +6813,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", - new Object[] { - "VWZ", - "WMS", - "CWZ", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'S', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, - 'Z', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_ElectromagneticSeparator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "VWZ", "WMS", "CWZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_ElectromagneticSeparator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 564, "basicmachine.electromagneticseparator.tier.04", "Advanced Electromagnetic Separator III", @@ -9043,25 +6838,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", - new Object[] { - "VWZ", - "WMS", - "CWZ", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'S', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, - 'Z', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_ElectromagneticSeparator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "VWZ", "WMS", "CWZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_ElectromagneticSeparator.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 565, "basicmachine.electromagneticseparator.tier.05", "Advanced Electromagnetic Separator IV", @@ -9079,26 +6863,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", - new Object[] { - "VWZ", - "WMS", - "CWZ", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'S', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, - 'Z', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Autoclave.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "VWZ", "WMS", "CWZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_Autoclave.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 571, "basicmachine.autoclave.tier.01", "Basic Autoclave", @@ -9116,25 +6889,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "AUTOCLAVE", - new Object[] { - "IGI", - "IMI", - "CPC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'I', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_Autoclave.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_Autoclave.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 572, "basicmachine.autoclave.tier.02", "Advanced Autoclave", @@ -9152,25 +6914,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "AUTOCLAVE", - new Object[] { - "IGI", - "IMI", - "CPC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'I', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_Autoclave.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_Autoclave.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 573, "basicmachine.autoclave.tier.03", "Advanced Autoclave II", @@ -9188,25 +6939,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "AUTOCLAVE", - new Object[] { - "IGI", - "IMI", - "CPC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'I', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_Autoclave.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_Autoclave.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 574, "basicmachine.autoclave.tier.04", "Advanced Autoclave III", @@ -9224,25 +6964,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "AUTOCLAVE", - new Object[] { - "IGI", - "IMI", - "CPC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'I', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_Autoclave.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_Autoclave.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 575, "basicmachine.autoclave.tier.05", "Advanced Autoclave IV", @@ -9260,26 +6989,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "AUTOCLAVE", - new Object[] { - "IGI", - "IMI", - "CPC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'I', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + + ItemList.Machine_LV_Mixer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 581, "basicmachine.mixer.tier.01", "Basic Mixer", @@ -9297,23 +7015,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "MIXER", - new Object[] { - "GRG", - "GEG", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GRG", "GEG", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_Mixer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 582, "basicmachine.mixer.tier.02", "Advanced Mixer", @@ -9331,23 +7040,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "MIXER", - new Object[] { - "GRG", - "GEG", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GRG", "GEG", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_Mixer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 583, "basicmachine.mixer.tier.03", "Advanced Mixer II", @@ -9365,23 +7065,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "MIXER", - new Object[] { - "GRG", - "GEG", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GRG", "GEG", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_Mixer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 584, "basicmachine.mixer.tier.04", "Advanced Mixer III", @@ -9399,23 +7090,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "MIXER", - new Object[] { - "GRG", - "GEG", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GRG", "GEG", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_Mixer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 585, "basicmachine.mixer.tier.05", "Advanced Mixer IV", @@ -9433,24 +7115,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "MIXER", - new Object[] { - "GRG", - "GEG", - aTextCableHull, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, - 'R', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - - ItemList.Machine_LV_LaserEngraver.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "GRG", "GEG", aTextCableHull, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + + ItemList.Machine_LV_LaserEngraver.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 591, "basicmachine.laserengraver.tier.01", "Basic Precision Laser Engraver", @@ -9468,23 +7141,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "LASER_ENGRAVER", - new Object[] { - "PEP", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_LaserEngraver.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_LaserEngraver.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 592, "basicmachine.laserengraver.tier.02", "Advanced Precision Laser Engraver", @@ -9502,23 +7166,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "LASER_ENGRAVER", - new Object[] { - "PEP", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_LaserEngraver.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_LaserEngraver.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 593, "basicmachine.laserengraver.tier.03", "Advanced Precision Laser Engraver II", @@ -9536,23 +7191,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "LASER_ENGRAVER", - new Object[] { - "PEP", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_LaserEngraver.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_LaserEngraver.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 594, "basicmachine.laserengraver.tier.04", "Advanced Precision Laser Engraver III", @@ -9570,23 +7216,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "LASER_ENGRAVER", - new Object[] { - "PEP", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_LaserEngraver.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_LaserEngraver.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 595, "basicmachine.laserengraver.tier.05", "Advanced Precision Laser Engraver IV", @@ -9604,24 +7241,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "LASER_ENGRAVER", - new Object[] { - "PEP", - aTextCableHull, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Press.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_Press.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 601, "basicmachine.press.tier.01", "Basic Forming Press", @@ -9639,21 +7267,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "PRESS", - new Object[] { - aTextWirePump, - aTextCableHull, - aTextWirePump, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Press.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_Press.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 602, "basicmachine.press.tier.02", "Advanced Forming Press", @@ -9671,21 +7291,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "PRESS", - new Object[] { - aTextWirePump, - aTextCableHull, - aTextWirePump, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Press.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_Press.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 603, "basicmachine.press.tier.03", "Advanced Forming Press II", @@ -9703,21 +7315,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "PRESS", - new Object[] { - aTextWirePump, - aTextCableHull, - aTextWirePump, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Press.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_Press.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 604, "basicmachine.press.tier.04", "Advanced Forming Press III", @@ -9735,21 +7339,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "PRESS", - new Object[] { - aTextWirePump, - aTextCableHull, - aTextWirePump, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Press.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_Press.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 605, "basicmachine.press.tier.05", "Advanced Forming Press IV", @@ -9767,22 +7363,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "PRESS", - new Object[] { - aTextWirePump, - aTextCableHull, - aTextWirePump, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Hammer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_Hammer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 611, "basicmachine.hammer.tier.01", "Basic Forge Hammer", @@ -9800,25 +7388,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.MAIN_RANDOM_SPARKS, "HAMMER", - new Object[] { - aTextWirePump, - aTextCableHull, - "WAW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, - 'A', - OreDictNames.craftingAnvil - }) - .getStackForm(1L)); - ItemList.Machine_MV_Hammer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'A', + OreDictNames.craftingAnvil }).getStackForm(1L)); + ItemList.Machine_MV_Hammer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 612, "basicmachine.hammer.tier.02", "Advanced Forge Hammer", @@ -9836,25 +7414,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.MAIN_RANDOM_SPARKS, "HAMMER", - new Object[] { - aTextWirePump, - aTextCableHull, - "WAW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, - 'A', - OreDictNames.craftingAnvil - }) - .getStackForm(1L)); - ItemList.Machine_HV_Hammer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'A', + OreDictNames.craftingAnvil }).getStackForm(1L)); + ItemList.Machine_HV_Hammer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 613, "basicmachine.hammer.tier.03", "Advanced Forge Hammer II", @@ -9872,25 +7440,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.MAIN_RANDOM_SPARKS, "HAMMER", - new Object[] { - aTextWirePump, - aTextCableHull, - "WAW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, - 'A', - OreDictNames.craftingAnvil - }) - .getStackForm(1L)); - ItemList.Machine_EV_Hammer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'A', + OreDictNames.craftingAnvil }).getStackForm(1L)); + ItemList.Machine_EV_Hammer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 614, "basicmachine.hammer.tier.04", "Advanced Forge Hammer III", @@ -9908,25 +7466,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.MAIN_RANDOM_SPARKS, "HAMMER", - new Object[] { - aTextWirePump, - aTextCableHull, - "WAW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, - 'A', - OreDictNames.craftingAnvil - }) - .getStackForm(1L)); - ItemList.Machine_IV_Hammer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'A', + OreDictNames.craftingAnvil }).getStackForm(1L)); + ItemList.Machine_IV_Hammer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 615, "basicmachine.hammer.tier.05", "Advanced Forge Hammer IV", @@ -9944,26 +7492,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.MAIN_RANDOM_SPARKS, "HAMMER", - new Object[] { - aTextWirePump, - aTextCableHull, - "WAW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, - 'A', - OreDictNames.craftingAnvil - }) - .getStackForm(1L)); - - ItemList.Machine_LV_FluidHeater.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'A', + OreDictNames.craftingAnvil }).getStackForm(1L)); + + ItemList.Machine_LV_FluidHeater.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 621, "basicmachine.fluidheater.tier.01", "Basic Fluid Heater", @@ -9981,25 +7519,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_HEATER", - new Object[] { - "OGO", - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_MV_FluidHeater.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_MV_FluidHeater.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 622, "basicmachine.fluidheater.tier.02", "Advanced Fluid Heater", @@ -10017,25 +7545,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_HEATER", - new Object[] { - "OGO", - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_HV_FluidHeater.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_HV_FluidHeater.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 623, "basicmachine.fluidheater.tier.03", "Advanced Fluid Heater II", @@ -10053,25 +7571,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_HEATER", - new Object[] { - "OGO", - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_EV_FluidHeater.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_EV_FluidHeater.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 624, "basicmachine.fluidheater.tier.04", "Advanced Fluid Heater III", @@ -10089,25 +7597,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_HEATER", - new Object[] { - "OGO", - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - ItemList.Machine_IV_FluidHeater.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + ItemList.Machine_IV_FluidHeater.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 625, "basicmachine.fluidheater.tier.05", "Advanced Fluid Heater IV", @@ -10125,26 +7623,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "FLUID_HEATER", - new Object[] { - "OGO", - aTextPlateMotor, - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'O', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'G', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Slicer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'O', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); + + ItemList.Machine_LV_Slicer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 631, "basicmachine.slicer.tier.01", "Basic Slicing Machine", @@ -10162,23 +7650,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "SLICER", - new Object[] { - aTextWireCoil, - "PMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Slicer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_Slicer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 632, "basicmachine.slicer.tier.02", "Advanced Slicing Machine", @@ -10196,23 +7675,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "SLICER", - new Object[] { - aTextWireCoil, - "PMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Slicer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_Slicer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 633, "basicmachine.slicer.tier.03", "Advanced Slicing Machine II", @@ -10230,23 +7700,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "SLICER", - new Object[] { - aTextWireCoil, - "PMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Slicer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_Slicer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 634, "basicmachine.slicer.tier.04", "Advanced Slicing Machine III", @@ -10264,23 +7725,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "SLICER", - new Object[] { - aTextWireCoil, - "PMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Slicer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_Slicer.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 635, "basicmachine.slicer.tier.05", "Advanced Slicing Machine IV", @@ -10298,24 +7750,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "SLICER", - new Object[] { - aTextWireCoil, - "PMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Sifter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_Sifter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 641, "basicmachine.sifter.tier.01", "Basic Sifting Machine", @@ -10333,23 +7776,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "SIFTER", - new Object[] { - "WFW", - aTextPlateMotor, - "CFC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'F', - OreDictNames.craftingFilter, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_MV_Sifter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'F', OreDictNames.craftingFilter, + 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_MV_Sifter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 642, "basicmachine.sifter.tier.02", "Advanced Sifting Machine", @@ -10367,23 +7800,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "SIFTER", - new Object[] { - "WFW", - aTextPlateMotor, - "CFC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'F', - OreDictNames.craftingFilter, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_HV_Sifter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'F', OreDictNames.craftingFilter, + 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_HV_Sifter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 643, "basicmachine.sifter.tier.03", "Advanced Sifting Machine II", @@ -10401,23 +7824,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "SIFTER", - new Object[] { - "WFW", - aTextPlateMotor, - "CFC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'F', - OreDictNames.craftingFilter, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_EV_Sifter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'F', OreDictNames.craftingFilter, + 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_EV_Sifter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 644, "basicmachine.sifter.tier.04", "Advanced Sifting Machine III", @@ -10435,23 +7848,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "SIFTER", - new Object[] { - "WFW", - aTextPlateMotor, - "CFC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'F', - OreDictNames.craftingFilter, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - ItemList.Machine_IV_Sifter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'F', OreDictNames.craftingFilter, + 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + ItemList.Machine_IV_Sifter.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 645, "basicmachine.sifter.tier.05", "Advanced Sifting Machine IV", @@ -10469,24 +7872,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "SIFTER", - new Object[] { - "WFW", - aTextPlateMotor, - "CFC", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'F', - OreDictNames.craftingFilter, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE - }) - .getStackForm(1L)); - - ItemList.Machine_LV_ArcFurnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'F', OreDictNames.craftingFilter, + 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE }).getStackForm(1L)); + + ItemList.Machine_LV_ArcFurnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 651, "basicmachine.arcfurnace.tier.01", "Basic Arc Furnace", @@ -10504,23 +7897,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ARC_FURNACE", - new Object[] { - "WGW", - aTextCableHull, - aTextPlate, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, - 'G', - OrePrefixes.cell.get(Materials.Graphite) - }) - .getStackForm(1L)); - ItemList.Machine_MV_ArcFurnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G', + OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L)); + ItemList.Machine_MV_ArcFurnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 652, "basicmachine.arcfurnace.tier.02", "Advanced Arc Furnace", @@ -10538,23 +7922,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ARC_FURNACE", - new Object[] { - "WGW", - aTextCableHull, - aTextPlate, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, - 'G', - OrePrefixes.cell.get(Materials.Graphite) - }) - .getStackForm(1L)); - ItemList.Machine_HV_ArcFurnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G', + OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L)); + ItemList.Machine_HV_ArcFurnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 653, "basicmachine.arcfurnace.tier.03", "Advanced Arc Furnace II", @@ -10572,23 +7947,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ARC_FURNACE", - new Object[] { - "WGW", - aTextCableHull, - aTextPlate, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, - 'G', - OrePrefixes.cell.get(Materials.Graphite) - }) - .getStackForm(1L)); - ItemList.Machine_EV_ArcFurnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G', + OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L)); + ItemList.Machine_EV_ArcFurnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 654, "basicmachine.arcfurnace.tier.04", "Advanced Arc Furnace III", @@ -10606,23 +7972,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ARC_FURNACE", - new Object[] { - "WGW", - aTextCableHull, - aTextPlate, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, - 'G', - OrePrefixes.cell.get(Materials.Graphite) - }) - .getStackForm(1L)); - ItemList.Machine_IV_ArcFurnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G', + OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L)); + ItemList.Machine_IV_ArcFurnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 655, "basicmachine.arcfurnace.tier.05", "Advanced Arc Furnace IV", @@ -10640,24 +7997,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ARC_FURNACE", - new Object[] { - "WGW", - aTextCableHull, - aTextPlate, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, - 'G', - OrePrefixes.cell.get(Materials.Graphite) - }) - .getStackForm(1L)); - - ItemList.Machine_LV_PlasmaArcFurnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G', + OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L)); + + ItemList.Machine_LV_PlasmaArcFurnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 661, "basicmachine.plasmaarcfurnace.tier.01", "Basic Plasma Arc Furnace", @@ -10675,25 +8023,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "PLASMA_ARC_FURNACE", - new Object[] { - "WGW", - aTextCableHull, - "TPT", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, - 'T', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'G', - OrePrefixes.cell.get(Materials.Graphite) - }) - .getStackForm(1L)); - ItemList.Machine_MV_PlasmaArcFurnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WGW", aTextCableHull, "TPT", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'T', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'G', + OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L)); + ItemList.Machine_MV_PlasmaArcFurnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 662, "basicmachine.plasmaarcfurnace.tier.02", "Advanced Plasma Arc Furnace", @@ -10711,25 +8049,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "PLASMA_ARC_FURNACE", - new Object[] { - "WGW", - aTextCableHull, - "TPT", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, - 'T', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'G', - OrePrefixes.cell.get(Materials.Graphite) - }) - .getStackForm(1L)); - ItemList.Machine_HV_PlasmaArcFurnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WGW", aTextCableHull, "TPT", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'T', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'G', + OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L)); + ItemList.Machine_HV_PlasmaArcFurnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 663, "basicmachine.plasmaarcfurnace.tier.03", "Advanced Plasma Arc Furnace II", @@ -10747,25 +8075,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "PLASMA_ARC_FURNACE", - new Object[] { - "WGW", - aTextCableHull, - "TPT", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, - 'T', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'G', - OrePrefixes.cell.get(Materials.Graphite) - }) - .getStackForm(1L)); - ItemList.Machine_EV_PlasmaArcFurnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WGW", aTextCableHull, "TPT", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'T', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'G', + OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L)); + ItemList.Machine_EV_PlasmaArcFurnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 664, "basicmachine.plasmaarcfurnace.tier.04", "Advanced Plasma Arc Furnace III", @@ -10783,25 +8101,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "PLASMA_ARC_FURNACE", - new Object[] { - "WGW", - aTextCableHull, - "TPT", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, - 'T', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'G', - OrePrefixes.cell.get(Materials.Graphite) - }) - .getStackForm(1L)); - ItemList.Machine_IV_PlasmaArcFurnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WGW", aTextCableHull, "TPT", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'T', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'G', + OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L)); + ItemList.Machine_IV_PlasmaArcFurnace.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 665, "basicmachine.plasmaarcfurnace.tier.05", "Advanced Plasma Arc Furnace IV", @@ -10819,26 +8127,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "PLASMA_ARC_FURNACE", - new Object[] { - "WGW", - aTextCableHull, - "TPT", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'P', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, - 'T', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, - 'G', - OrePrefixes.cell.get(Materials.Graphite) - }) - .getStackForm(1L)); - - ItemList.Machine_LV_Oven.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "WGW", aTextCableHull, "TPT", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'T', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'G', + OrePrefixes.cell.get(Materials.Graphite) }).getStackForm(1L)); + + ItemList.Machine_LV_Oven.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 671, "basicmachine.e_oven.tier.01", "Basic Electric Oven", @@ -10856,22 +8154,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTRIC_OVEN", - new Object[] { - "CEC", - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING - }) - .setProgressBarTextureName("E_Oven") - .getStackForm(1L)); - ItemList.Machine_MV_Oven.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) + .setProgressBarTextureName("E_Oven").getStackForm(1L)); + ItemList.Machine_MV_Oven.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 672, "basicmachine.e_oven.tier.02", "Advanced Electric Oven", @@ -10889,22 +8179,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTRIC_OVEN", - new Object[] { - "CEC", - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING - }) - .setProgressBarTextureName("E_Oven") - .getStackForm(1L)); - ItemList.Machine_HV_Oven.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) + .setProgressBarTextureName("E_Oven").getStackForm(1L)); + ItemList.Machine_HV_Oven.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 673, "basicmachine.e_oven.tier.03", "Advanced Electric Oven II", @@ -10922,22 +8204,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTRIC_OVEN", - new Object[] { - "CEC", - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING - }) - .setProgressBarTextureName("E_Oven") - .getStackForm(1L)); - ItemList.Machine_EV_Oven.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) + .setProgressBarTextureName("E_Oven").getStackForm(1L)); + ItemList.Machine_EV_Oven.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 674, "basicmachine.e_oven.tier.04", "Advanced Electric Oven III", @@ -10955,22 +8229,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTRIC_OVEN", - new Object[] { - "CEC", - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING - }) - .setProgressBarTextureName("E_Oven") - .getStackForm(1L)); - ItemList.Machine_IV_Oven.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "CEC", aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) + .setProgressBarTextureName("E_Oven").getStackForm(1L)); + ItemList.Machine_IV_Oven.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 675, "basicmachine.e_oven.tier.05", "Advanced Electric Oven IV", @@ -10988,151 +8254,86 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "ELECTRIC_OVEN", - new Object[] { - "CEC", - aTextCableHull, - "WEW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING - }) - .setProgressBarTextureName("E_Oven") - .getStackForm(1L)); - - ItemList.Machine_LV_Miner.set( - new GT_MetaTileEntity_Miner(679, "basicmachine.miner.tier.01", "Basic Miner", 1).getStackForm(1L)); - ItemList.Machine_MV_Miner.set( - new GT_MetaTileEntity_Miner(680, "basicmachine.miner.tier.02", "Good Miner", 2).getStackForm(1L)); + new Object[] { "CEC", aTextCableHull, "WEW", 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) + .setProgressBarTextureName("E_Oven").getStackForm(1L)); + + ItemList.Machine_LV_Miner + .set(new GT_MetaTileEntity_Miner(679, "basicmachine.miner.tier.01", "Basic Miner", 1).getStackForm(1L)); + ItemList.Machine_MV_Miner + .set(new GT_MetaTileEntity_Miner(680, "basicmachine.miner.tier.02", "Good Miner", 2).getStackForm(1L)); ItemList.Machine_HV_Miner.set( new GT_MetaTileEntity_Miner(681, "basicmachine.miner.tier.03", "Advanced Miner", 3).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Miner.get(1L), bitsd, new Object[] { - "EEE", - aTextWireHull, - "CSC", - 'M', - ItemList.Hull_LV, - 'E', - ItemList.Electric_Motor_LV, - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin), - 'S', - ItemList.Sensor_LV - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Miner.get(1L), bitsd, new Object[] { - "PEP", - aTextWireHull, - "CSC", - 'M', - ItemList.Hull_MV, - 'E', - ItemList.Electric_Motor_MV, - 'P', - ItemList.Electric_Piston_MV, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt02.get(Materials.Copper), - 'S', - ItemList.Sensor_MV - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Miner.get(1L), bitsd, new Object[] { - "RPR", - aTextWireHull, - "CSC", - 'M', - ItemList.Hull_HV, - 'E', - ItemList.Electric_Motor_HV, - 'P', - ItemList.Electric_Piston_HV, - 'R', - ItemList.Robot_Arm_HV, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt04.get(Materials.Gold), - 'S', - ItemList.Sensor_HV - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_LV_Miner.get(1L), + bitsd, + new Object[] { "EEE", aTextWireHull, "CSC", 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'C', + OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'S', + ItemList.Sensor_LV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_MV_Miner.get(1L), + bitsd, + new Object[] { "PEP", aTextWireHull, "CSC", 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'P', + ItemList.Electric_Piston_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.cableGt02.get(Materials.Copper), 'S', ItemList.Sensor_MV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HV_Miner.get(1L), + bitsd, + new Object[] { "RPR", aTextWireHull, "CSC", 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'P', + ItemList.Electric_Piston_HV, 'R', ItemList.Robot_Arm_HV, 'C', + OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt04.get(Materials.Gold), + 'S', ItemList.Sensor_HV }); } private static void run3() { ItemList.Machine_Multi_BlastFurnace.set( new GT_MetaTileEntity_ElectricBlastFurnace(1000, "multimachine.blastfurnace", "Electric Blast Furnace") .getStackForm(1L)); - ItemList.Machine_Multi_ImplosionCompressor.set(new GT_MetaTileEntity_ImplosionCompressor( - 1001, "multimachine.implosioncompressor", "Implosion Compressor") - .getStackForm(1L)); + ItemList.Machine_Multi_ImplosionCompressor.set( + new GT_MetaTileEntity_ImplosionCompressor( + 1001, + "multimachine.implosioncompressor", + "Implosion Compressor").getStackForm(1L)); ItemList.Machine_Multi_VacuumFreezer.set( new GT_MetaTileEntity_VacuumFreezer(1002, "multimachine.vacuumfreezer", "Vacuum Freezer") .getStackForm(1L)); ItemList.Machine_Multi_Furnace.set( new GT_MetaTileEntity_MultiFurnace(1003, "multimachine.multifurnace", "Multi Smelter") .getStackForm(1L)); - ItemList.Machine_Multi_PlasmaForge.set(new GT_MetaTileEntity_PlasmaForge( - 1004, "multimachine.plasmaforge", "Dimensionally Transcendent Plasma Forge") - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_BlastFurnace.get(1L), bitsd, new Object[] { - "FFF", - aTextCableHull, - aTextWireCoil, - 'M', - ItemList.Casing_HeatProof, - 'F', - OreDictNames.craftingIronFurnace, - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_VacuumFreezer.get(1L), bitsd, new Object[] { - aTextPlate, - aTextCableHull, - aTextWireCoil, - 'M', - ItemList.Casing_FrostProof, - 'P', - ItemList.Electric_Pump_HV, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_ImplosionCompressor.get(1L), bitsd, new Object[] { - "OOO", - aTextCableHull, - aTextWireCoil, - 'M', - ItemList.Casing_SolidSteel, - 'O', - Ic2Items.reinforcedStone, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Furnace.get(1L), bitsd, new Object[] { - "FFF", - aTextCableHull, - aTextWireCoil, - 'M', - ItemList.Casing_HeatProof, - 'F', - OreDictNames.craftingIronFurnace, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.AnnealedCopper) - }); + ItemList.Machine_Multi_PlasmaForge.set( + new GT_MetaTileEntity_PlasmaForge( + 1004, + "multimachine.plasmaforge", + "Dimensionally Transcendent Plasma Forge").getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_BlastFurnace.get(1L), + bitsd, + new Object[] { "FFF", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_HeatProof, 'F', + OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.cableGt01.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_VacuumFreezer.get(1L), + bitsd, + new Object[] { aTextPlate, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_FrostProof, 'P', + ItemList.Electric_Pump_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + OrePrefixes.cableGt01.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_ImplosionCompressor.get(1L), + bitsd, + new Object[] { "OOO", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_SolidSteel, 'O', + Ic2Items.reinforcedStone, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.cableGt01.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_Furnace.get(1L), + bitsd, + new Object[] { "FFF", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_HeatProof, 'F', + OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.cableGt01.get(Materials.AnnealedCopper) }); ItemList.Machine_Multi_LargeBoiler_Bronze.set( new GT_MetaTileEntity_LargeBoiler_Bronze(1020, "multimachine.boiler.bronze", "Large Bronze Boiler") @@ -11140,439 +8341,302 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Machine_Multi_LargeBoiler_Steel.set( new GT_MetaTileEntity_LargeBoiler_Steel(1021, "multimachine.boiler.steel", "Large Steel Boiler") .getStackForm(1L)); - ItemList.Machine_Multi_LargeBoiler_Titanium.set(new GT_MetaTileEntity_LargeBoiler_Titanium( - 1022, "multimachine.boiler.titanium", "Large Titanium Boiler") - .getStackForm(1L)); - ItemList.Machine_Multi_LargeBoiler_TungstenSteel.set(new GT_MetaTileEntity_LargeBoiler_TungstenSteel( - 1023, "multimachine.boiler.tungstensteel", "Large Tungstensteel Boiler") - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_Bronze.get(1L), bitsd, new Object[] { - aTextWireCoil, - aTextCableHull, - aTextWireCoil, - 'M', - ItemList.Casing_Firebox_Bronze, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_Steel.get(1L), bitsd, new Object[] { - aTextWireCoil, - aTextCableHull, - aTextWireCoil, - 'M', - ItemList.Casing_Firebox_Steel, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.AnyCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_Titanium.get(1L), bitsd, new Object[] { - aTextWireCoil, - aTextCableHull, - aTextWireCoil, - 'M', - ItemList.Casing_Firebox_Titanium, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_TungstenSteel.get(1L), bitsd, new Object[] { - aTextWireCoil, - aTextCableHull, - aTextWireCoil, - 'M', - ItemList.Casing_Firebox_TungstenSteel, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt01.get(Materials.Aluminium) - }); - - ItemList.Generator_Diesel_LV.set(new GT_MetaTileEntity_DieselGenerator( - 1110, "basicgenerator.diesel.tier.01", "Basic Combustion Generator", 1) - .getStackForm(1L)); - ItemList.Generator_Diesel_MV.set(new GT_MetaTileEntity_DieselGenerator( - 1111, "basicgenerator.diesel.tier.02", "Advanced Combustion Generator", 2) - .getStackForm(1L)); - ItemList.Generator_Diesel_HV.set(new GT_MetaTileEntity_DieselGenerator( - 1112, "basicgenerator.diesel.tier.03", "Turbo Combustion Generator", 3) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Diesel_LV.get(1L), bitsd, new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_LV, - 'P', - ItemList.Electric_Piston_LV, - 'E', - ItemList.Electric_Motor_LV, - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin), - 'G', - OrePrefixes.gearGt.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Diesel_MV.get(1L), bitsd, new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_MV, - 'P', - ItemList.Electric_Piston_MV, - 'E', - ItemList.Electric_Motor_MV, - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt01.get(Materials.AnyCopper), - 'G', - OrePrefixes.gearGt.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Diesel_HV.get(1L), bitsd, new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_HV, - 'P', - ItemList.Electric_Piston_HV, - 'E', - ItemList.Electric_Motor_HV, - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold), - 'G', - OrePrefixes.gearGt.get(Materials.StainlessSteel) - }); + ItemList.Machine_Multi_LargeBoiler_Titanium.set( + new GT_MetaTileEntity_LargeBoiler_Titanium( + 1022, + "multimachine.boiler.titanium", + "Large Titanium Boiler").getStackForm(1L)); + ItemList.Machine_Multi_LargeBoiler_TungstenSteel.set( + new GT_MetaTileEntity_LargeBoiler_TungstenSteel( + 1023, + "multimachine.boiler.tungstensteel", + "Large Tungstensteel Boiler").getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_LargeBoiler_Bronze.get(1L), + bitsd, + new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Bronze, 'C', + OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_LargeBoiler_Steel.get(1L), + bitsd, + new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Steel, 'C', + OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.cableGt01.get(Materials.AnyCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_LargeBoiler_Titanium.get(1L), + bitsd, + new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Titanium, 'C', + OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_LargeBoiler_TungstenSteel.get(1L), + bitsd, + new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_TungstenSteel, + 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.cableGt01.get(Materials.Aluminium) }); + + ItemList.Generator_Diesel_LV.set( + new GT_MetaTileEntity_DieselGenerator( + 1110, + "basicgenerator.diesel.tier.01", + "Basic Combustion Generator", + 1).getStackForm(1L)); + ItemList.Generator_Diesel_MV.set( + new GT_MetaTileEntity_DieselGenerator( + 1111, + "basicgenerator.diesel.tier.02", + "Advanced Combustion Generator", + 2).getStackForm(1L)); + ItemList.Generator_Diesel_HV.set( + new GT_MetaTileEntity_DieselGenerator( + 1112, + "basicgenerator.diesel.tier.03", + "Turbo Combustion Generator", + 3).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Diesel_LV.get(1L), + bitsd, + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E', + ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.cableGt01.get(Materials.Tin), 'G', OrePrefixes.gearGt.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Diesel_MV.get(1L), + bitsd, + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E', + ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', + OrePrefixes.gearGt.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Diesel_HV.get(1L), + bitsd, + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E', + ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.cableGt01.get(Materials.Gold), 'G', + OrePrefixes.gearGt.get(Materials.StainlessSteel) }); ItemList.Generator_Gas_Turbine_LV.set( new GT_MetaTileEntity_GasTurbine(1115, "basicgenerator.gasturbine.tier.01", "Basic Gas Turbine", 1, 95) .getStackForm(1L)); - ItemList.Generator_Gas_Turbine_MV.set(new GT_MetaTileEntity_GasTurbine( - 1116, "basicgenerator.gasturbine.tier.02", "Advanced Gas Turbine", 2, 90) - .getStackForm(1L)); + ItemList.Generator_Gas_Turbine_MV.set( + new GT_MetaTileEntity_GasTurbine( + 1116, + "basicgenerator.gasturbine.tier.02", + "Advanced Gas Turbine", + 2, + 90).getStackForm(1L)); ItemList.Generator_Gas_Turbine_HV.set( new GT_MetaTileEntity_GasTurbine(1117, "basicgenerator.gasturbine.tier.03", "Turbo Gas Turbine", 3, 85) .getStackForm(1L)); - ItemList.Generator_Gas_Turbine_EV.set(new GT_MetaTileEntity_GasTurbine( - 1118, "basicgenerator.gasturbine.tier.04", "Turbo Gas Turbine II", 4, 60) - .getStackForm(1L)); - ItemList.Generator_Gas_Turbine_IV.set(new GT_MetaTileEntity_GasTurbine( - 1119, "basicgenerator.gasturbine.tier.05", "Turbo Gas Turbine III", 5, 50) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_LV.get(1L), bitsd, new Object[] { - "CRC", - "RMR", - aTextMotorWire, - 'M', - ItemList.Hull_LV, - 'E', - ItemList.Electric_Motor_LV, - 'R', - OrePrefixes.rotor.get(Materials.Tin), - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_MV.get(1L), bitsd, new Object[] { - "CRC", - "RMR", - aTextMotorWire, - 'M', - ItemList.Hull_MV, - 'E', - ItemList.Electric_Motor_MV, - 'R', - OrePrefixes.rotor.get(Materials.Bronze), - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt01.get(Materials.AnyCopper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_HV.get(1L), bitsd, new Object[] { - "CRC", - "RMR", - aTextMotorWire, - 'M', - ItemList.Hull_HV, - 'E', - ItemList.Electric_Motor_HV, - 'R', - OrePrefixes.rotor.get(Materials.Steel), - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_EV.get(1L), bitsd, new Object[] { - "CRC", - "RMR", - aTextMotorWire, - 'M', - ItemList.Hull_EV, - 'E', - ItemList.Electric_Motor_EV, - 'R', - OrePrefixes.rotor.get(Materials.Titanium), - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'W', - OrePrefixes.cableGt01.get(Materials.Aluminium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_IV.get(1L), bitsd, new Object[] { - "CRC", - "RMR", - aTextMotorWire, - 'M', - ItemList.Hull_IV, - 'E', - ItemList.Electric_Motor_IV, - 'R', - OrePrefixes.rotor.get(Materials.TungstenSteel), - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt01.get(Materials.Tungsten) - }); - - ItemList.Generator_Steam_Turbine_LV.set(new GT_MetaTileEntity_SteamTurbine( - 1120, "basicgenerator.steamturbine.tier.01", "Basic Steam Turbine", 1) - .getStackForm(1L)); - ItemList.Generator_Steam_Turbine_MV.set(new GT_MetaTileEntity_SteamTurbine( - 1121, "basicgenerator.steamturbine.tier.02", "Advanced Steam Turbine", 2) - .getStackForm(1L)); - ItemList.Generator_Steam_Turbine_HV.set(new GT_MetaTileEntity_SteamTurbine( - 1122, "basicgenerator.steamturbine.tier.03", "Turbo Steam Turbine", 3) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Steam_Turbine_LV.get(1L), bitsd, new Object[] { - "PCP", - "RMR", - aTextMotorWire, - 'M', - ItemList.Hull_LV, - 'E', - ItemList.Electric_Motor_LV, - 'R', - OrePrefixes.rotor.get(Materials.Tin), - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'W', - OrePrefixes.cableGt01.get(Materials.Tin), - 'P', - OrePrefixes.pipeMedium.get(Materials.Bronze) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Steam_Turbine_MV.get(1L), bitsd, new Object[] { - "PCP", - "RMR", - aTextMotorWire, - 'M', - ItemList.Hull_MV, - 'E', - ItemList.Electric_Motor_MV, - 'R', - OrePrefixes.rotor.get(Materials.Bronze), - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'W', - OrePrefixes.cableGt01.get(Materials.AnyCopper), - 'P', - OrePrefixes.pipeMedium.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Steam_Turbine_HV.get(1L), bitsd, new Object[] { - "PCP", - "RMR", - aTextMotorWire, - 'M', - ItemList.Hull_HV, - 'E', - ItemList.Electric_Motor_HV, - 'R', - OrePrefixes.rotor.get(Materials.Steel), - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'W', - OrePrefixes.cableGt01.get(Materials.Gold), - 'P', - OrePrefixes.pipeMedium.get(Materials.StainlessSteel) - }); - - ItemList.Generator_Naquadah_Mark_I.set(new GT_MetaTileEntity_NaquadahReactor( + ItemList.Generator_Gas_Turbine_EV.set( + new GT_MetaTileEntity_GasTurbine( + 1118, + "basicgenerator.gasturbine.tier.04", + "Turbo Gas Turbine II", + 4, + 60).getStackForm(1L)); + ItemList.Generator_Gas_Turbine_IV.set( + new GT_MetaTileEntity_GasTurbine( + 1119, + "basicgenerator.gasturbine.tier.05", + "Turbo Gas Turbine III", + 5, + 50).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Gas_Turbine_LV.get(1L), + bitsd, + new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, + 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.cableGt01.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Gas_Turbine_MV.get(1L), + bitsd, + new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, + 'R', OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.cableGt01.get(Materials.AnyCopper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Gas_Turbine_HV.get(1L), + bitsd, + new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, + 'R', OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), + 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Gas_Turbine_EV.get(1L), + bitsd, + new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_EV, 'E', ItemList.Electric_Motor_EV, + 'R', OrePrefixes.rotor.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Data), + 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Gas_Turbine_IV.get(1L), + bitsd, + new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_IV, 'E', ItemList.Electric_Motor_IV, + 'R', OrePrefixes.rotor.get(Materials.TungstenSteel), 'C', + OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten) }); + + ItemList.Generator_Steam_Turbine_LV.set( + new GT_MetaTileEntity_SteamTurbine( + 1120, + "basicgenerator.steamturbine.tier.01", + "Basic Steam Turbine", + 1).getStackForm(1L)); + ItemList.Generator_Steam_Turbine_MV.set( + new GT_MetaTileEntity_SteamTurbine( + 1121, + "basicgenerator.steamturbine.tier.02", + "Advanced Steam Turbine", + 2).getStackForm(1L)); + ItemList.Generator_Steam_Turbine_HV.set( + new GT_MetaTileEntity_SteamTurbine( + 1122, + "basicgenerator.steamturbine.tier.03", + "Turbo Steam Turbine", + 3).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Steam_Turbine_LV.get(1L), + bitsd, + new Object[] { "PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, + 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.cableGt01.get(Materials.Tin), 'P', OrePrefixes.pipeMedium.get(Materials.Bronze) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Steam_Turbine_MV.get(1L), + bitsd, + new Object[] { "PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, + 'R', OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.cableGt01.get(Materials.AnyCopper), 'P', + OrePrefixes.pipeMedium.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Steam_Turbine_HV.get(1L), + bitsd, + new Object[] { "PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, + 'R', OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), + 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'P', + OrePrefixes.pipeMedium.get(Materials.StainlessSteel) }); + + ItemList.Generator_Naquadah_Mark_I.set( + new GT_MetaTileEntity_NaquadahReactor( 1190, "basicgenerator.naquadah.tier.04", - new String[] {"Requires Enriched Naquadah Bolts"}, + new String[] { "Requires Enriched Naquadah Bolts" }, "Naquadah Reactor Mark I", - 4) - .getStackForm(1L)); - ItemList.Generator_Naquadah_Mark_II.set(new GT_MetaTileEntity_NaquadahReactor( + 4).getStackForm(1L)); + ItemList.Generator_Naquadah_Mark_II.set( + new GT_MetaTileEntity_NaquadahReactor( 1191, "basicgenerator.naquadah.tier.05", - new String[] {"Requires Enriched Naquadah Rods"}, + new String[] { "Requires Enriched Naquadah Rods" }, "Naquadah Reactor Mark II", - 5) - .getStackForm(1L)); - ItemList.Generator_Naquadah_Mark_III.set(new GT_MetaTileEntity_NaquadahReactor( + 5).getStackForm(1L)); + ItemList.Generator_Naquadah_Mark_III.set( + new GT_MetaTileEntity_NaquadahReactor( 1192, "basicgenerator.naquadah.tier.06", - new String[] {"Requires Enriched Naquadah Long Rods"}, + new String[] { "Requires Enriched Naquadah Long Rods" }, "Naquadah Reactor Mark III", - 6) - .getStackForm(1L)); - ItemList.Generator_Naquadah_Mark_IV.set(new GT_MetaTileEntity_NaquadahReactor( + 6).getStackForm(1L)); + ItemList.Generator_Naquadah_Mark_IV.set( + new GT_MetaTileEntity_NaquadahReactor( 1188, "basicgenerator.naquadah.tier.07", - new String[] {"Requires Naquadria Bolts"}, + new String[] { "Requires Naquadria Bolts" }, "Naquadah Reactor Mark IV", - 7) - .getStackForm(1L)); - ItemList.Generator_Naquadah_Mark_V.set(new GT_MetaTileEntity_NaquadahReactor( + 7).getStackForm(1L)); + ItemList.Generator_Naquadah_Mark_V.set( + new GT_MetaTileEntity_NaquadahReactor( 1189, "basicgenerator.naquadah.tier.08", - new String[] {"Requires Naquadria Rods"}, + new String[] { "Requires Naquadria Rods" }, "Naquadah Reactor Mark V", - 8) - .getStackForm(1L)); - - ItemList.MagicEnergyConverter_LV.set(new GT_MetaTileEntity_MagicEnergyConverter( - 1123, "basicgenerator.magicenergyconverter.tier.01", "Novice Magic Energy Converter", 1) - .getStackForm(1L)); - ItemList.MagicEnergyConverter_MV.set(new GT_MetaTileEntity_MagicEnergyConverter( - 1124, "basicgenerator.magicenergyconverter.tier.02", "Adept Magic Energy Converter", 2) - .getStackForm(1L)); - ItemList.MagicEnergyConverter_HV.set(new GT_MetaTileEntity_MagicEnergyConverter( - 1125, "basicgenerator.magicenergyconverter.tier.03", "Master Magic Energy Converter", 3) - .getStackForm(1L)); - - ItemList.MagicEnergyAbsorber_LV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber( - 1127, "basicgenerator.magicenergyabsorber.tier.01", "Novice Magic Energy Absorber", 1) - .getStackForm(1L)); - ItemList.MagicEnergyAbsorber_MV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber( - 1128, "basicgenerator.magicenergyabsorber.tier.02", "Adept Magic Energy Absorber", 2) - .getStackForm(1L)); - ItemList.MagicEnergyAbsorber_HV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber( - 1129, "basicgenerator.magicenergyabsorber.tier.03", "Master Magic Energy Absorber", 3) - .getStackForm(1L)); - ItemList.MagicEnergyAbsorber_EV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber( - 1130, "basicgenerator.magicenergyabsorber.tier.04", "Grandmaster Magic Energy Absorber", 4) - .getStackForm(1L)); + 8).getStackForm(1L)); + + ItemList.MagicEnergyConverter_LV.set( + new GT_MetaTileEntity_MagicEnergyConverter( + 1123, + "basicgenerator.magicenergyconverter.tier.01", + "Novice Magic Energy Converter", + 1).getStackForm(1L)); + ItemList.MagicEnergyConverter_MV.set( + new GT_MetaTileEntity_MagicEnergyConverter( + 1124, + "basicgenerator.magicenergyconverter.tier.02", + "Adept Magic Energy Converter", + 2).getStackForm(1L)); + ItemList.MagicEnergyConverter_HV.set( + new GT_MetaTileEntity_MagicEnergyConverter( + 1125, + "basicgenerator.magicenergyconverter.tier.03", + "Master Magic Energy Converter", + 3).getStackForm(1L)); + + ItemList.MagicEnergyAbsorber_LV.set( + new GT_MetaTileEntity_MagicalEnergyAbsorber( + 1127, + "basicgenerator.magicenergyabsorber.tier.01", + "Novice Magic Energy Absorber", + 1).getStackForm(1L)); + ItemList.MagicEnergyAbsorber_MV.set( + new GT_MetaTileEntity_MagicalEnergyAbsorber( + 1128, + "basicgenerator.magicenergyabsorber.tier.02", + "Adept Magic Energy Absorber", + 2).getStackForm(1L)); + ItemList.MagicEnergyAbsorber_HV.set( + new GT_MetaTileEntity_MagicalEnergyAbsorber( + 1129, + "basicgenerator.magicenergyabsorber.tier.03", + "Master Magic Energy Absorber", + 3).getStackForm(1L)); + ItemList.MagicEnergyAbsorber_EV.set( + new GT_MetaTileEntity_MagicalEnergyAbsorber( + 1130, + "basicgenerator.magicenergyabsorber.tier.04", + "Grandmaster Magic Energy Absorber", + 4).getStackForm(1L)); if (!Loader.isModLoaded("Thaumcraft")) { - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_LV.get(1L), bitsd, new Object[] { - "CTC", - "FMF", - "CBC", - 'M', - ItemList.Hull_LV, - 'B', - new ItemStack(Blocks.beacon), - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'T', - ItemList.Field_Generator_LV, - 'F', - OrePrefixes.plate.get(Materials.Platinum) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_MV.get(1L), bitsd, new Object[] { - "CTC", - "FMF", - "CBC", - 'M', - ItemList.Hull_MV, - 'B', - new ItemStack(Blocks.beacon), - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'T', - ItemList.Field_Generator_MV, - 'F', - OrePrefixes.plate.get(Materials.Iridium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_HV.get(1L), bitsd, new Object[] { - "CTC", - "FMF", - "CBC", - 'M', - ItemList.Hull_HV, - 'B', - new ItemStack(Blocks.beacon), - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'T', - ItemList.Field_Generator_HV, - 'F', - OrePrefixes.plate.get(Materials.Neutronium) - }); - - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_LV.get(1L), bitsd, new Object[] { - "CTC", - "FMF", - "CBC", - 'M', - ItemList.Hull_LV, - 'B', - ItemList.MagicEnergyConverter_LV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'T', - ItemList.Field_Generator_LV, - 'F', - OrePrefixes.plate.get(Materials.Platinum) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_MV.get(1L), bitsd, new Object[] { - "CTC", - "FMF", - "CBC", - 'M', - ItemList.Hull_MV, - 'B', - ItemList.MagicEnergyConverter_MV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'T', - ItemList.Field_Generator_MV, - 'F', - OrePrefixes.plate.get(Materials.Iridium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_HV.get(1L), bitsd, new Object[] { - "CTC", - "FMF", - "CBC", - 'M', - ItemList.Hull_HV, - 'B', - ItemList.MagicEnergyConverter_MV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'T', - ItemList.Field_Generator_HV, - 'F', - OrePrefixes.plate.get(Materials.Europium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_EV.get(1L), bitsd, new Object[] { - "CTC", - "FMF", - "CBC", - 'M', - ItemList.Hull_HV, - 'B', - ItemList.MagicEnergyConverter_HV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'T', - ItemList.Field_Generator_EV, - 'F', - OrePrefixes.plate.get(Materials.Neutronium) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.MagicEnergyConverter_LV.get(1L), + bitsd, + new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_LV, 'B', new ItemStack(Blocks.beacon), 'C', + OrePrefixes.circuit.get(Materials.Advanced), 'T', ItemList.Field_Generator_LV, 'F', + OrePrefixes.plate.get(Materials.Platinum) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MagicEnergyConverter_MV.get(1L), + bitsd, + new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_MV, 'B', new ItemStack(Blocks.beacon), 'C', + OrePrefixes.circuit.get(Materials.Data), 'T', ItemList.Field_Generator_MV, 'F', + OrePrefixes.plate.get(Materials.Iridium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MagicEnergyConverter_HV.get(1L), + bitsd, + new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', new ItemStack(Blocks.beacon), 'C', + OrePrefixes.circuit.get(Materials.Elite), 'T', ItemList.Field_Generator_HV, 'F', + OrePrefixes.plate.get(Materials.Neutronium) }); + + GT_ModHandler.addCraftingRecipe( + ItemList.MagicEnergyAbsorber_LV.get(1L), + bitsd, + new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_LV, 'B', + ItemList.MagicEnergyConverter_LV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Advanced), + 'T', ItemList.Field_Generator_LV, 'F', OrePrefixes.plate.get(Materials.Platinum) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MagicEnergyAbsorber_MV.get(1L), + bitsd, + new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_MV, 'B', + ItemList.MagicEnergyConverter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Data), 'T', + ItemList.Field_Generator_MV, 'F', OrePrefixes.plate.get(Materials.Iridium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MagicEnergyAbsorber_HV.get(1L), + bitsd, + new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', + ItemList.MagicEnergyConverter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Elite), + 'T', ItemList.Field_Generator_HV, 'F', OrePrefixes.plate.get(Materials.Europium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MagicEnergyAbsorber_EV.get(1L), + bitsd, + new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', + ItemList.MagicEnergyConverter_HV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Master), + 'T', ItemList.Field_Generator_EV, 'F', OrePrefixes.plate.get(Materials.Neutronium) }); } ItemList.FusionComputer_LuV.set( new GT_MetaTileEntity_FusionComputer1(1193, "fusioncomputer.tier.06", "Fusion Control Computer Mark I") @@ -11580,116 +8644,81 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.FusionComputer_ZPMV.set( new GT_MetaTileEntity_FusionComputer2(1194, "fusioncomputer.tier.07", "Fusion Control Computer Mark II") .getStackForm(1L)); - ItemList.FusionComputer_UV.set(new GT_MetaTileEntity_FusionComputer3( - 1195, "fusioncomputer.tier.08", "Fusion Control Computer Mark III") - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Fusion_Coil.get(1L), bitsd, new Object[] { - "CTC", - "FMF", - "CTC", - 'M', - ItemList.Casing_Coil_Superconductor, - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'F', - ItemList.Field_Generator_MV, - 'T', - ItemList.Neutron_Reflector - }); - - ItemList.Generator_Plasma_IV.set(new GT_MetaTileEntity_PlasmaGenerator( - 1196, "basicgenerator.plasmagenerator.tier.05", "Plasma Generator Mark I", 4) - .getStackForm(1L)); - ItemList.Generator_Plasma_LuV.set(new GT_MetaTileEntity_PlasmaGenerator( - 1197, "basicgenerator.plasmagenerator.tier.06", "Plasma Generator Mark II", 5) - .getStackForm(1L)); - ItemList.Generator_Plasma_ZPMV.set(new GT_MetaTileEntity_PlasmaGenerator( - 1198, "basicgenerator.plasmagenerator.tier.07", "Plasma Generator Mark III", 6) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Plasma_IV.get(1L), bitsd, new Object[] { - "UCU", - "FMF", - aTextWireCoil, - 'M', - ItemList.Hull_LuV, - 'F', - ItemList.Field_Generator_HV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt04.get(Materials.Tungsten), - 'U', - OrePrefixes.stick.get(Materials.Plutonium241) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Plasma_LuV.get(1L), bitsd, new Object[] { - "UCU", - "FMF", - aTextWireCoil, - 'M', - ItemList.Hull_ZPM, - 'F', - ItemList.Field_Generator_EV, - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'W', - OrePrefixes.wireGt04.get(Materials.VanadiumGallium), - 'U', - OrePrefixes.stick.get(Materials.Europium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Plasma_ZPMV.get(1L), bitsd, new Object[] { - "UCU", - "FMF", - aTextWireCoil, - 'M', - ItemList.Hull_UV, - 'F', - ItemList.Field_Generator_IV, - 'C', - OrePrefixes.circuit.get(Materials.Ultimate), - 'W', - OrePrefixes.wireGt04.get(Materials.Naquadah), - 'U', - OrePrefixes.stick.get(Materials.Americium) - }); + ItemList.FusionComputer_UV.set( + new GT_MetaTileEntity_FusionComputer3( + 1195, + "fusioncomputer.tier.08", + "Fusion Control Computer Mark III").getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Fusion_Coil.get(1L), + bitsd, + new Object[] { "CTC", "FMF", "CTC", 'M', ItemList.Casing_Coil_Superconductor, 'C', + OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Field_Generator_MV, 'T', + ItemList.Neutron_Reflector }); + + ItemList.Generator_Plasma_IV.set( + new GT_MetaTileEntity_PlasmaGenerator( + 1196, + "basicgenerator.plasmagenerator.tier.05", + "Plasma Generator Mark I", + 4).getStackForm(1L)); + ItemList.Generator_Plasma_LuV.set( + new GT_MetaTileEntity_PlasmaGenerator( + 1197, + "basicgenerator.plasmagenerator.tier.06", + "Plasma Generator Mark II", + 5).getStackForm(1L)); + ItemList.Generator_Plasma_ZPMV.set( + new GT_MetaTileEntity_PlasmaGenerator( + 1198, + "basicgenerator.plasmagenerator.tier.07", + "Plasma Generator Mark III", + 6).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Plasma_IV.get(1L), + bitsd, + new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_HV, + 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.cableGt04.get(Materials.Tungsten), 'U', + OrePrefixes.stick.get(Materials.Plutonium241) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Plasma_LuV.get(1L), + bitsd, + new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_EV, + 'C', OrePrefixes.circuit.get(Materials.Master), 'W', + OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'U', + OrePrefixes.stick.get(Materials.Europium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Generator_Plasma_ZPMV.get(1L), + bitsd, + new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_IV, + 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', + OrePrefixes.wireGt04.get(Materials.Naquadah), 'U', + OrePrefixes.stick.get(Materials.Americium) }); ItemList.Processing_Array.set( new GT_MetaTileEntity_ProcessingArray(1199, "multimachine.processingarray", "Processing Array") .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Processing_Array.get(1L), bitsd, new Object[] { - "CTC", - "FMF", - "CBC", - 'M', - ItemList.Hull_EV, - 'B', - OrePrefixes.pipeLarge.get(Materials.StainlessSteel), - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'F', - ItemList.Robot_Arm_EV, - 'T', - ItemList.Energy_LapotronicOrb - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Processing_Array.get(1L), + bitsd, + new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_EV, 'B', + OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', + OrePrefixes.circuit.get(Materials.Elite), 'F', ItemList.Robot_Arm_EV, 'T', + ItemList.Energy_LapotronicOrb }); GT_ProcessingArrayRecipeLoader.registerDefaultGregtechMaps(); ItemList.Distillation_Tower.set( new GT_MetaTileEntity_DistillationTower(1126, "multimachine.distillationtower", "Distillation Tower") .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Distillation_Tower.get(1L), bitsd, new Object[] { - "CBC", - "FMF", - "CBC", - 'M', - ItemList.Hull_HV, - 'B', - OrePrefixes.pipeLarge.get(Materials.StainlessSteel), - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'F', - ItemList.Electric_Pump_HV - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Distillation_Tower.get(1L), + bitsd, + new Object[] { "CBC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', + OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', + OrePrefixes.circuit.get(Materials.Data), 'F', ItemList.Electric_Pump_HV }); ItemList.Ore_Processor.set( new GT_MetaTileEntity_IntegratedOreFactory(1132, "multimachine.oreprocessor", "Integrated Ore Factory") @@ -11701,58 +8730,44 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.LargeGasTurbine.set( new GT_MetaTileEntity_LargeTurbine_Gas(1151, "multimachine.largegasturbine", "Large Gas Turbine") .getStackForm(1L)); - ItemList.LargeHPSteamTurbine.set(new GT_MetaTileEntity_LargeTurbine_HPSteam( - 1152, "multimachine.largehpturbine", "Large HP Steam Turbine") - .getStackForm(1L)); - ItemList.LargeAdvancedGasTurbine.set(new GT_MetaTileEntity_LargeTurbine_GasAdvanced( - 1005, "multimachine.largeadvancedgasturbine", "Large Advanced Gas Turbine") - .getStackForm(1L)); - ItemList.LargePlasmaTurbine.set(new GT_MetaTileEntity_LargeTurbine_Plasma( - 1153, "multimachine.largeplasmaturbine", "Large Plasma Generator") - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.LargeSteamTurbine.get(1L), bitsd, new Object[] { - "CPC", - aTextPlateMotor, - "BPB", - 'M', - ItemList.Hull_HV, - 'B', - OrePrefixes.pipeLarge.get(Materials.Steel), - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'P', - OrePrefixes.gearGt.get(Materials.Steel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.LargeGasTurbine.get(1L), bitsd, new Object[] { - "CPC", - aTextPlateMotor, - "BPB", - 'M', - ItemList.Hull_EV, - 'B', - OrePrefixes.pipeLarge.get(Materials.StainlessSteel), - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'P', - OrePrefixes.gearGt.get(Materials.StainlessSteel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.LargeAdvancedGasTurbine.get(1L), bitsd, new Object[] { - "CPC", - aTextPlateMotor, - "BPB", - 'M', - ItemList.Hull_IV, - 'B', - OrePrefixes.pipeLarge.get(Materials.TungstenSteel), - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'P', - OrePrefixes.gearGt.get(Materials.HSSG) - }); - - ItemList.Pump_LV.set( - new GT_MetaTileEntity_Pump(1140, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L)); + ItemList.LargeHPSteamTurbine.set( + new GT_MetaTileEntity_LargeTurbine_HPSteam( + 1152, + "multimachine.largehpturbine", + "Large HP Steam Turbine").getStackForm(1L)); + ItemList.LargeAdvancedGasTurbine.set( + new GT_MetaTileEntity_LargeTurbine_GasAdvanced( + 1005, + "multimachine.largeadvancedgasturbine", + "Large Advanced Gas Turbine").getStackForm(1L)); + ItemList.LargePlasmaTurbine.set( + new GT_MetaTileEntity_LargeTurbine_Plasma( + 1153, + "multimachine.largeplasmaturbine", + "Large Plasma Generator").getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.LargeSteamTurbine.get(1L), + bitsd, + new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B', + OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), + 'P', OrePrefixes.gearGt.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.LargeGasTurbine.get(1L), + bitsd, + new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B', + OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', + OrePrefixes.circuit.get(Materials.Data), 'P', + OrePrefixes.gearGt.get(Materials.StainlessSteel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.LargeAdvancedGasTurbine.get(1L), + bitsd, + new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B', + OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', + OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.gearGt.get(Materials.HSSG) }); + + ItemList.Pump_LV + .set(new GT_MetaTileEntity_Pump(1140, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L)); ItemList.Pump_MV.set( new GT_MetaTileEntity_Pump(1141, "basicmachine.pump.tier.02", "Advanced Pump", 2).getStackForm(1L)); ItemList.Pump_HV.set( @@ -11762,312 +8777,241 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Pump_IV.set( new GT_MetaTileEntity_Pump(1144, "basicmachine.pump.tier.05", "Advanced Pump IV", 5).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Pump_LV.get(1L), bitsd, new Object[] { - "CPC", - aTextPlateMotor, - "BPB", - 'M', - ItemList.Hull_LV, - 'B', - OrePrefixes.pipeLarge.get(Materials.Bronze), - 'C', - OrePrefixes.circuit.get(Materials.Basic), - 'P', - ItemList.Electric_Pump_LV - }); - GT_ModHandler.addCraftingRecipe(ItemList.Pump_MV.get(1L), bitsd, new Object[] { - "CPC", - aTextPlateMotor, - "BPB", - 'M', - ItemList.Hull_MV, - 'B', - OrePrefixes.pipeLarge.get(Materials.Steel), - 'C', - OrePrefixes.circuit.get(Materials.Good), - 'P', - ItemList.Electric_Pump_MV - }); - GT_ModHandler.addCraftingRecipe(ItemList.Pump_HV.get(1L), bitsd, new Object[] { - "CPC", - aTextPlateMotor, - "BPB", - 'M', - ItemList.Hull_HV, - 'B', - OrePrefixes.pipeLarge.get(Materials.StainlessSteel), - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'P', - ItemList.Electric_Pump_HV - }); - GT_ModHandler.addCraftingRecipe(ItemList.Pump_EV.get(1L), bitsd, new Object[] { - "CPC", - aTextPlateMotor, - "BPB", - 'M', - ItemList.Hull_EV, - 'B', - OrePrefixes.pipeLarge.get(Materials.Titanium), - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'P', - ItemList.Electric_Pump_EV - }); - GT_ModHandler.addCraftingRecipe(ItemList.Pump_IV.get(1L), bitsd, new Object[] { - "CPC", - aTextPlateMotor, - "BPB", - 'M', - ItemList.Hull_IV, - 'B', - OrePrefixes.pipeLarge.get(Materials.TungstenSteel), - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'P', - ItemList.Electric_Pump_IV - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Pump_LV.get(1L), + bitsd, + new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_LV, 'B', + OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Basic), 'P', + ItemList.Electric_Pump_LV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Pump_MV.get(1L), + bitsd, + new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_MV, 'B', + OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Good), 'P', + ItemList.Electric_Pump_MV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Pump_HV.get(1L), + bitsd, + new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B', + OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', + OrePrefixes.circuit.get(Materials.Advanced), 'P', ItemList.Electric_Pump_HV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Pump_EV.get(1L), + bitsd, + new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B', + OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Data), + 'P', ItemList.Electric_Pump_EV }); + GT_ModHandler.addCraftingRecipe( + ItemList.Pump_IV.get(1L), + bitsd, + new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B', + OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', + OrePrefixes.circuit.get(Materials.Elite), 'P', ItemList.Electric_Pump_IV }); ItemList.Teleporter.set( new GT_MetaTileEntity_Teleporter(1145, "basicmachine.teleporter", "Teleporter", 9).getStackForm(1L)); - ItemList.MobRep_LV.set(new GT_MetaTileEntity_MonsterRepellent( - 1146, "basicmachine.mobrep.tier.01", "Basic Monster Repellator", 1) - .getStackForm(1L)); - ItemList.MobRep_MV.set(new GT_MetaTileEntity_MonsterRepellent( - 1147, "basicmachine.mobrep.tier.02", "Advanced Monster Repellator", 2) - .getStackForm(1L)); - ItemList.MobRep_HV.set(new GT_MetaTileEntity_MonsterRepellent( - 1148, "basicmachine.mobrep.tier.03", "Advanced Monster Repellator II", 3) - .getStackForm(1L)); - ItemList.MobRep_EV.set(new GT_MetaTileEntity_MonsterRepellent( - 1149, "basicmachine.mobrep.tier.04", "Advanced Monster Repellator III", 4) - .getStackForm(1L)); - ItemList.MobRep_IV.set(new GT_MetaTileEntity_MonsterRepellent( - 1150, "basicmachine.mobrep.tier.05", "Advanced Monster Repellator IV", 5) - .getStackForm(1L)); - ItemList.MobRep_LuV.set(new GT_MetaTileEntity_MonsterRepellent( - 1135, "basicmachine.mobrep.tier.06", "Advanced Monster Repellator V", 6) - .getStackForm(1L)); - ItemList.MobRep_ZPM.set(new GT_MetaTileEntity_MonsterRepellent( - 1136, "basicmachine.mobrep.tier.07", "Advanced Monster Repellator VI", 7) - .getStackForm(1L)); - ItemList.MobRep_UV.set(new GT_MetaTileEntity_MonsterRepellent( - 1137, "basicmachine.mobrep.tier.08", "Advanced Monster Repellator VII", 8) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_LV.get(1L), bitsd, new Object[] { - "EEE", - " M ", - "CCC", - 'M', - ItemList.Hull_LV, - 'E', - ItemList.Emitter_LV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_MV.get(1L), bitsd, new Object[] { - "EEE", - " M ", - "CCC", - 'M', - ItemList.Hull_MV, - 'E', - ItemList.Emitter_MV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Good) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_HV.get(1L), bitsd, new Object[] { - "EEE", - " M ", - "CCC", - 'M', - ItemList.Hull_HV, - 'E', - ItemList.Emitter_HV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Advanced) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_EV.get(1L), bitsd, new Object[] { - "EEE", - " M ", - "CCC", - 'M', - ItemList.Hull_EV, - 'E', - ItemList.Emitter_EV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Data) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_IV.get(1L), bitsd, new Object[] { - "EEE", - " M ", - "CCC", - 'M', - ItemList.Hull_IV, - 'E', - ItemList.Emitter_IV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Elite) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_LuV.get(1L), bitsd, new Object[] { - "EEE", - " M ", - "CCC", - 'M', - ItemList.Hull_LuV, - 'E', - ItemList.Emitter_LuV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Master) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_ZPM.get(1L), bitsd, new Object[] { - "EEE", - " M ", - "CCC", - 'M', - ItemList.Hull_ZPM, - 'E', - ItemList.Emitter_ZPM.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.Ultimate) - }); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_UV.get(1L), bitsd, new Object[] { - "EEE", - " M ", - "CCC", - 'M', - ItemList.Hull_UV, - 'E', - ItemList.Emitter_UV.get(1L), - 'C', - OrePrefixes.circuit.get(Materials.SuperconductorUHV) - }); + ItemList.MobRep_LV.set( + new GT_MetaTileEntity_MonsterRepellent( + 1146, + "basicmachine.mobrep.tier.01", + "Basic Monster Repellator", + 1).getStackForm(1L)); + ItemList.MobRep_MV.set( + new GT_MetaTileEntity_MonsterRepellent( + 1147, + "basicmachine.mobrep.tier.02", + "Advanced Monster Repellator", + 2).getStackForm(1L)); + ItemList.MobRep_HV.set( + new GT_MetaTileEntity_MonsterRepellent( + 1148, + "basicmachine.mobrep.tier.03", + "Advanced Monster Repellator II", + 3).getStackForm(1L)); + ItemList.MobRep_EV.set( + new GT_MetaTileEntity_MonsterRepellent( + 1149, + "basicmachine.mobrep.tier.04", + "Advanced Monster Repellator III", + 4).getStackForm(1L)); + ItemList.MobRep_IV.set( + new GT_MetaTileEntity_MonsterRepellent( + 1150, + "basicmachine.mobrep.tier.05", + "Advanced Monster Repellator IV", + 5).getStackForm(1L)); + ItemList.MobRep_LuV.set( + new GT_MetaTileEntity_MonsterRepellent( + 1135, + "basicmachine.mobrep.tier.06", + "Advanced Monster Repellator V", + 6).getStackForm(1L)); + ItemList.MobRep_ZPM.set( + new GT_MetaTileEntity_MonsterRepellent( + 1136, + "basicmachine.mobrep.tier.07", + "Advanced Monster Repellator VI", + 7).getStackForm(1L)); + ItemList.MobRep_UV.set( + new GT_MetaTileEntity_MonsterRepellent( + 1137, + "basicmachine.mobrep.tier.08", + "Advanced Monster Repellator VII", + 8).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.MobRep_LV.get(1L), + bitsd, + new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_LV, 'E', ItemList.Emitter_LV.get(1L), 'C', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MobRep_MV.get(1L), + bitsd, + new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_MV, 'E', ItemList.Emitter_MV.get(1L), 'C', + OrePrefixes.circuit.get(Materials.Good) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MobRep_HV.get(1L), + bitsd, + new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_HV, 'E', ItemList.Emitter_HV.get(1L), 'C', + OrePrefixes.circuit.get(Materials.Advanced) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MobRep_EV.get(1L), + bitsd, + new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_EV, 'E', ItemList.Emitter_EV.get(1L), 'C', + OrePrefixes.circuit.get(Materials.Data) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MobRep_IV.get(1L), + bitsd, + new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_IV, 'E', ItemList.Emitter_IV.get(1L), 'C', + OrePrefixes.circuit.get(Materials.Elite) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MobRep_LuV.get(1L), + bitsd, + new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_LuV, 'E', ItemList.Emitter_LuV.get(1L), 'C', + OrePrefixes.circuit.get(Materials.Master) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MobRep_ZPM.get(1L), + bitsd, + new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_ZPM, 'E', ItemList.Emitter_ZPM.get(1L), 'C', + OrePrefixes.circuit.get(Materials.Ultimate) }); + GT_ModHandler.addCraftingRecipe( + ItemList.MobRep_UV.get(1L), + bitsd, + new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_UV, 'E', ItemList.Emitter_UV.get(1L), 'C', + OrePrefixes.circuit.get(Materials.SuperconductorUHV) }); ItemList.Machine_Multi_HeatExchanger.set( new GT_MetaTileEntity_HeatExchanger(1154, "multimachine.heatexchanger", "Large Heat Exchanger") .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_HeatExchanger.get(1L), bitsd, new Object[] { - aTextWireCoil, - aTextCableHull, - aTextWireCoil, - 'M', - ItemList.Casing_Pipe_Titanium, - 'C', - OrePrefixes.pipeMedium.get(Materials.Titanium), - 'W', - ItemList.Electric_Pump_EV - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_HeatExchanger.get(1L), + bitsd, + new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Pipe_Titanium, 'C', + OrePrefixes.pipeMedium.get(Materials.Titanium), 'W', ItemList.Electric_Pump_EV }); ItemList.Charcoal_Pile.set( new GT_MetaTileEntity_Charcoal_Pit(1155, "multimachine.charcoalpile", "Charcoal Pile Igniter") .getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Charcoal_Pile.get(1L), bitsd, new Object[] { - "EXE", - "EME", - "hCw", - 'M', - ItemList.Hull_HP_Bricks, - 'E', - OrePrefixes.plate.get(Materials.AnyBronze), - 'C', - new ItemStack(Items.flint_and_steel, 1), - 'X', - OrePrefixes.rotor.get(Materials.Steel), - }); - - ItemList.Seismic_Prospector_LV.set(new GT_MetaTileEntity_SeismicProspector( - 1156, "basicmachine.seismicprospector.01", "Seismic Prospector LV", 1) - .getStackForm(1)); - ItemList.Seismic_Prospector_MV.set(new GT_MetaTileEntity_SeismicProspector( - 2100, "basicmachine.seismicprospector.02", "Seismic Prospector MV", 2) - .getStackForm(1)); - ItemList.Seismic_Prospector_HV.set(new GT_MetaTileEntity_SeismicProspector( - 2101, "basicmachine.seismicprospector.03", "Seismic Prospector HV", 3) - .getStackForm(1)); - - ItemList.Seismic_Prospector_Adv_LV.set(new GT_MetaTileEntity_AdvSeismicProspector( - 2102, "basicmachine.seismicprospector.07", "Advanced Seismic Prospector LV", 1, 5 * 16 / 2, 2) - .getStackForm(1)); - ItemList.Seismic_Prospector_Adv_MV.set(new GT_MetaTileEntity_AdvSeismicProspector( - 2103, "basicmachine.seismicprospector.06", "Advanced Seismic Prospector MV", 2, 7 * 16 / 2, 2) - .getStackForm(1)); - ItemList.Seismic_Prospector_Adv_HV.set(new GT_MetaTileEntity_AdvSeismicProspector( - 2104, "basicmachine.seismicprospector.05", "Advanced Seismic Prospector HV", 3, 9 * 16 / 2, 2) - .getStackForm(1)); - ItemList.Seismic_Prospector_Adv_EV.set(new GT_MetaTileEntity_AdvSeismicProspector( - 1173, "basicmachine.seismicprospector.04", "Advanced Seismic Prospector EV", 4, 11 * 16 / 2, 2) - .getStackForm(1)); + GT_ModHandler.addCraftingRecipe( + ItemList.Charcoal_Pile.get(1L), + bitsd, + new Object[] { "EXE", "EME", "hCw", 'M', ItemList.Hull_HP_Bricks, 'E', + OrePrefixes.plate.get(Materials.AnyBronze), 'C', new ItemStack(Items.flint_and_steel, 1), 'X', + OrePrefixes.rotor.get(Materials.Steel), }); + + ItemList.Seismic_Prospector_LV.set( + new GT_MetaTileEntity_SeismicProspector( + 1156, + "basicmachine.seismicprospector.01", + "Seismic Prospector LV", + 1).getStackForm(1)); + ItemList.Seismic_Prospector_MV.set( + new GT_MetaTileEntity_SeismicProspector( + 2100, + "basicmachine.seismicprospector.02", + "Seismic Prospector MV", + 2).getStackForm(1)); + ItemList.Seismic_Prospector_HV.set( + new GT_MetaTileEntity_SeismicProspector( + 2101, + "basicmachine.seismicprospector.03", + "Seismic Prospector HV", + 3).getStackForm(1)); + + ItemList.Seismic_Prospector_Adv_LV.set( + new GT_MetaTileEntity_AdvSeismicProspector( + 2102, + "basicmachine.seismicprospector.07", + "Advanced Seismic Prospector LV", + 1, + 5 * 16 / 2, + 2).getStackForm(1)); + ItemList.Seismic_Prospector_Adv_MV.set( + new GT_MetaTileEntity_AdvSeismicProspector( + 2103, + "basicmachine.seismicprospector.06", + "Advanced Seismic Prospector MV", + 2, + 7 * 16 / 2, + 2).getStackForm(1)); + ItemList.Seismic_Prospector_Adv_HV.set( + new GT_MetaTileEntity_AdvSeismicProspector( + 2104, + "basicmachine.seismicprospector.05", + "Advanced Seismic Prospector HV", + 3, + 9 * 16 / 2, + 2).getStackForm(1)); + ItemList.Seismic_Prospector_Adv_EV.set( + new GT_MetaTileEntity_AdvSeismicProspector( + 1173, + "basicmachine.seismicprospector.04", + "Advanced Seismic Prospector EV", + 4, + 11 * 16 / 2, + 2).getStackForm(1)); // Converter recipes in case you had old one lying around GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Seismic_Prospector_Adv_LV.get(1L), bits, new Object[] {ItemList.Seismic_Prospector_LV}); + ItemList.Seismic_Prospector_Adv_LV.get(1L), + bits, + new Object[] { ItemList.Seismic_Prospector_LV }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Seismic_Prospector_Adv_MV.get(1L), bits, new Object[] {ItemList.Seismic_Prospector_MV}); + ItemList.Seismic_Prospector_Adv_MV.get(1L), + bits, + new Object[] { ItemList.Seismic_Prospector_MV }); GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Seismic_Prospector_Adv_HV.get(1L), bits, new Object[] {ItemList.Seismic_Prospector_HV}); - - GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_LV.get(1L), bitsd, new Object[] { - "WWW", - "EME", - "CXC", - 'M', - ItemList.Hull_LV, - 'W', - OrePrefixes.plateDouble.get(Materials.Steel), - 'E', - OrePrefixes.circuit.get(Materials.Basic), - 'C', - ItemList.Sensor_LV, - 'X', - OrePrefixes.cableGt02.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_MV.get(1L), bitsd, new Object[] { - "WWW", - "EME", - "CXC", - 'M', - ItemList.Hull_MV, - 'W', - OrePrefixes.plateDouble.get(Materials.BlackSteel), - 'E', - OrePrefixes.circuit.get(Materials.Good), - 'C', - ItemList.Sensor_MV, - 'X', - OrePrefixes.cableGt02.get(Materials.Copper) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_HV.get(1L), bitsd, new Object[] { - "WWW", - "EME", - "CXC", - 'M', - ItemList.Hull_HV, - 'W', - OrePrefixes.plateDouble.get(Materials.StainlessSteel), - 'E', - OrePrefixes.circuit.get(Materials.Advanced), - 'C', - ItemList.Sensor_HV, - 'X', - OrePrefixes.cableGt04.get(Materials.Gold) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_EV.get(1L), bitsd, new Object[] { - "WWW", - "EME", - "CXC", - 'M', - ItemList.Hull_EV, - 'W', - OrePrefixes.plateDouble.get(Materials.VanadiumSteel), - 'E', - OrePrefixes.circuit.get(Materials.Data), - 'C', - ItemList.Sensor_EV, - 'X', - OrePrefixes.cableGt04.get(Materials.Aluminium) - }); + ItemList.Seismic_Prospector_Adv_HV.get(1L), + bits, + new Object[] { ItemList.Seismic_Prospector_HV }); + + GT_ModHandler.addCraftingRecipe( + ItemList.Seismic_Prospector_Adv_LV.get(1L), + bitsd, + new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_LV, 'W', + OrePrefixes.plateDouble.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Basic), + 'C', ItemList.Sensor_LV, 'X', OrePrefixes.cableGt02.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Seismic_Prospector_Adv_MV.get(1L), + bitsd, + new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_MV, 'W', + OrePrefixes.plateDouble.get(Materials.BlackSteel), 'E', OrePrefixes.circuit.get(Materials.Good), + 'C', ItemList.Sensor_MV, 'X', OrePrefixes.cableGt02.get(Materials.Copper) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Seismic_Prospector_Adv_HV.get(1L), + bitsd, + new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_HV, 'W', + OrePrefixes.plateDouble.get(Materials.StainlessSteel), 'E', + OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Sensor_HV, 'X', + OrePrefixes.cableGt04.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Seismic_Prospector_Adv_EV.get(1L), + bitsd, + new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_EV, 'W', + OrePrefixes.plateDouble.get(Materials.VanadiumSteel), 'E', + OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Sensor_EV, 'X', + OrePrefixes.cableGt04.get(Materials.Aluminium) }); ItemList.OilDrill1.set( new GT_MetaTileEntity_OilDrill1(1157, "multimachine.oildrill1", "Oil/Gas/Fluid Drilling Rig") @@ -12081,50 +9025,36 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.OilDrill4.set( new GT_MetaTileEntity_OilDrill4(149, "multimachine.oildrill4", "Oil/Gas/Fluid Drilling Rig IV") .getStackForm(1)); - ItemList.OilDrillInfinite.set(new GT_MetaTileEntity_OilDrillInfinite( - 148, "multimachine.oildrillinfinite", "Infinite Oil/Gas/Fluid Drilling Rig") - .getStackForm(1)); - - ItemList.ConcreteBackfiller1.set(new GT_MetaTileEntity_ConcreteBackfiller1( - 143, "multimachine.concretebackfiller1", "Concrete Backfiller") - .getStackForm(1)); - ItemList.ConcreteBackfiller2.set(new GT_MetaTileEntity_ConcreteBackfiller2( - 144, "multimachine.concretebackfiller3", "Advanced Concrete Backfiller") - .getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.ConcreteBackfiller1.get(1L), bitsd, new Object[] { - "WPW", - "EME", - "CQC", - 'M', - ItemList.Hull_MV, - 'W', - OrePrefixes.frameGt.get(Materials.Steel), - 'E', - OrePrefixes.circuit.get(Materials.Good), - 'C', - ItemList.Electric_Motor_MV, - 'P', - OrePrefixes.pipeLarge.get(Materials.Steel), - 'Q', - ItemList.Electric_Pump_MV - }); - GT_ModHandler.addCraftingRecipe(ItemList.ConcreteBackfiller2.get(1L), bitsd, new Object[] { - "WPW", - "EME", - "CQC", - 'M', - ItemList.ConcreteBackfiller1, - 'W', - OrePrefixes.frameGt.get(Materials.Titanium), - 'E', - OrePrefixes.circuit.get(Materials.Data), - 'C', - ItemList.Electric_Motor_EV, - 'P', - OrePrefixes.pipeLarge.get(Materials.Steel), - 'Q', - ItemList.Electric_Pump_EV - }); + ItemList.OilDrillInfinite.set( + new GT_MetaTileEntity_OilDrillInfinite( + 148, + "multimachine.oildrillinfinite", + "Infinite Oil/Gas/Fluid Drilling Rig").getStackForm(1)); + + ItemList.ConcreteBackfiller1.set( + new GT_MetaTileEntity_ConcreteBackfiller1( + 143, + "multimachine.concretebackfiller1", + "Concrete Backfiller").getStackForm(1)); + ItemList.ConcreteBackfiller2.set( + new GT_MetaTileEntity_ConcreteBackfiller2( + 144, + "multimachine.concretebackfiller3", + "Advanced Concrete Backfiller").getStackForm(1)); + GT_ModHandler.addCraftingRecipe( + ItemList.ConcreteBackfiller1.get(1L), + bitsd, + new Object[] { "WPW", "EME", "CQC", 'M', ItemList.Hull_MV, 'W', + OrePrefixes.frameGt.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', + ItemList.Electric_Motor_MV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', + ItemList.Electric_Pump_MV }); + GT_ModHandler.addCraftingRecipe( + ItemList.ConcreteBackfiller2.get(1L), + bitsd, + new Object[] { "WPW", "EME", "CQC", 'M', ItemList.ConcreteBackfiller1, 'W', + OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', + ItemList.Electric_Motor_EV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', + ItemList.Electric_Pump_EV }); ItemList.OreDrill1.set( new GT_MetaTileEntity_OreDrillingPlant1(1158, "multimachine.oredrill1", "Ore Drilling Plant") @@ -12139,263 +9069,167 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_OreDrillingPlant4(1179, "multimachine.oredrill4", "Ore Drilling Plant IV") .getStackForm(1)); - ItemList.PyrolyseOven.set( - new GT_MetaTileEntity_PyrolyseOven(1159, "multimachine.pyro", "Pyrolyse Oven").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.PyrolyseOven.get(1L), bitsd, new Object[] { - "WEP", - "EME", - "WCP", - 'M', - ItemList.Hull_MV, - 'W', - ItemList.Electric_Piston_MV, - 'P', - OrePrefixes.wireGt04.get(Materials.Cupronickel), - 'E', - OrePrefixes.circuit.get(Materials.Good), - 'C', - ItemList.Electric_Pump_MV - }); + ItemList.PyrolyseOven + .set(new GT_MetaTileEntity_PyrolyseOven(1159, "multimachine.pyro", "Pyrolyse Oven").getStackForm(1)); + GT_ModHandler.addCraftingRecipe( + ItemList.PyrolyseOven.get(1L), + bitsd, + new Object[] { "WEP", "EME", "WCP", 'M', ItemList.Hull_MV, 'W', ItemList.Electric_Piston_MV, 'P', + OrePrefixes.wireGt04.get(Materials.Cupronickel), 'E', OrePrefixes.circuit.get(Materials.Good), + 'C', ItemList.Electric_Pump_MV }); ItemList.OilCracker.set( new GT_MetaTileEntity_OilCracker(1160, "multimachine.cracker", "Oil Cracking Unit").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.OilCracker.get(1L), bitsd, new Object[] { - aTextWireCoil, - "EME", - aTextWireCoil, - 'M', - ItemList.Hull_HV, - 'W', - ItemList.Casing_Coil_Cupronickel, - 'E', - OrePrefixes.circuit.get(Materials.Advanced), - 'C', - ItemList.Electric_Pump_HV - }); - - ItemList.MicroTransmitter_HV.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter( - 1161, "basicmachine.microtransmitter.03", "HV Microwave Energy Transmitter", 3) - .getStackForm(1L)); - ItemList.MicroTransmitter_EV.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter( - 1162, "basicmachine.microtransmitter.04", "EV Microwave Energy Transmitter", 4) - .getStackForm(1L)); - ItemList.MicroTransmitter_IV.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter( - 1163, "basicmachine.microtransmitter.05", "IV Microwave Energy Transmitter", 5) - .getStackForm(1L)); - ItemList.MicroTransmitter_LUV.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter( - 1164, "basicmachine.microtransmitter.06", "LuV Microwave Energy Transmitter", 6) - .getStackForm(1L)); - ItemList.MicroTransmitter_ZPM.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter( - 1165, "basicmachine.microtransmitter.07", "ZPM Microwave Energy Transmitter", 7) - .getStackForm(1L)); - ItemList.MicroTransmitter_UV.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter( - 1166, "basicmachine.microtransmitter.08", "UV Microwave Energy Transmitter", 8) - .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_HV.get(1L), bitsd, new Object[] { - "CPC", - aTextCableHull, - "GBG", - 'M', - ItemList.Hull_HV, - 'B', - ItemList.Battery_RE_HV_Lithium, - 'C', - ItemList.Emitter_HV, - 'G', - OrePrefixes.circuit.get(Materials.Advanced), - 'P', - ItemList.Field_Generator_HV - }); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_EV.get(1L), bitsd, new Object[] { - "CPC", - aTextCableHull, - "GBG", - 'M', - ItemList.Hull_EV, - 'B', - GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), - 'C', - ItemList.Emitter_EV, - 'G', - OrePrefixes.circuit.get(Materials.Data), - 'P', - ItemList.Field_Generator_EV - }); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_IV.get(1L), bitsd, new Object[] { - "CPC", - aTextCableHull, - "GBG", - 'M', - ItemList.Hull_IV, - 'B', - ItemList.Energy_LapotronicOrb, - 'C', - ItemList.Emitter_IV, - 'G', - OrePrefixes.circuit.get(Materials.Elite), - 'P', - ItemList.Field_Generator_IV - }); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_LUV.get(1L), bitsd, new Object[] { - "CPC", - aTextCableHull, - "GBG", - 'M', - ItemList.Hull_LuV, - 'B', - ItemList.Energy_LapotronicOrb2, - 'C', - ItemList.Emitter_LuV, - 'G', - OrePrefixes.circuit.get(Materials.Master), - 'P', - ItemList.Field_Generator_LuV - }); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_ZPM.get(1L), bitsd, new Object[] { - "CPC", - aTextCableHull, - "GBG", - 'M', - ItemList.Hull_ZPM, - 'B', - GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) - ? ItemList.Energy_Module - : ItemList.ZPM2, - 'C', - ItemList.Emitter_ZPM, - 'G', - OrePrefixes.circuit.get(Materials.Ultimate), - 'P', - ItemList.Field_Generator_ZPM - }); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_UV.get(1L), bitsd, new Object[] { - "CPC", - aTextCableHull, - "GBG", - 'M', - ItemList.Hull_UV, - 'B', - GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) - ? ItemList.Energy_Module - : ItemList.ZPM3, - 'C', - ItemList.Emitter_UV, - 'G', - OrePrefixes.circuit.get(Materials.SuperconductorUHV), - 'P', - ItemList.Field_Generator_UV - }); + GT_ModHandler.addCraftingRecipe( + ItemList.OilCracker.get(1L), + bitsd, + new Object[] { aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_HV, 'W', + ItemList.Casing_Coil_Cupronickel, 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', + ItemList.Electric_Pump_HV }); + + ItemList.MicroTransmitter_HV.set( + new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + 1161, + "basicmachine.microtransmitter.03", + "HV Microwave Energy Transmitter", + 3).getStackForm(1L)); + ItemList.MicroTransmitter_EV.set( + new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + 1162, + "basicmachine.microtransmitter.04", + "EV Microwave Energy Transmitter", + 4).getStackForm(1L)); + ItemList.MicroTransmitter_IV.set( + new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + 1163, + "basicmachine.microtransmitter.05", + "IV Microwave Energy Transmitter", + 5).getStackForm(1L)); + ItemList.MicroTransmitter_LUV.set( + new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + 1164, + "basicmachine.microtransmitter.06", + "LuV Microwave Energy Transmitter", + 6).getStackForm(1L)); + ItemList.MicroTransmitter_ZPM.set( + new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + 1165, + "basicmachine.microtransmitter.07", + "ZPM Microwave Energy Transmitter", + 7).getStackForm(1L)); + ItemList.MicroTransmitter_UV.set( + new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + 1166, + "basicmachine.microtransmitter.08", + "UV Microwave Energy Transmitter", + 8).getStackForm(1L)); + GT_ModHandler.addCraftingRecipe( + ItemList.MicroTransmitter_HV.get(1L), + bitsd, + new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_HV, 'B', ItemList.Battery_RE_HV_Lithium, + 'C', ItemList.Emitter_HV, 'G', OrePrefixes.circuit.get(Materials.Advanced), 'P', + ItemList.Field_Generator_HV }); + GT_ModHandler.addCraftingRecipe( + ItemList.MicroTransmitter_EV.get(1L), + bitsd, + new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_EV, 'B', + GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), 'C', ItemList.Emitter_EV, 'G', + OrePrefixes.circuit.get(Materials.Data), 'P', ItemList.Field_Generator_EV }); + GT_ModHandler.addCraftingRecipe( + ItemList.MicroTransmitter_IV.get(1L), + bitsd, + new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_IV, 'B', ItemList.Energy_LapotronicOrb, + 'C', ItemList.Emitter_IV, 'G', OrePrefixes.circuit.get(Materials.Elite), 'P', + ItemList.Field_Generator_IV }); + GT_ModHandler.addCraftingRecipe( + ItemList.MicroTransmitter_LUV.get(1L), + bitsd, + new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_LuV, 'B', + ItemList.Energy_LapotronicOrb2, 'C', ItemList.Emitter_LuV, 'G', + OrePrefixes.circuit.get(Materials.Master), 'P', ItemList.Field_Generator_LuV }); + GT_ModHandler.addCraftingRecipe( + ItemList.MicroTransmitter_ZPM.get(1L), + bitsd, + new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_ZPM, 'B', + GregTech_API.sOPStuff + .get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) + ? ItemList.Energy_Module + : ItemList.ZPM2, + 'C', ItemList.Emitter_ZPM, 'G', OrePrefixes.circuit.get(Materials.Ultimate), 'P', + ItemList.Field_Generator_ZPM }); + GT_ModHandler.addCraftingRecipe( + ItemList.MicroTransmitter_UV.get(1L), + bitsd, + new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_UV, 'B', + GregTech_API.sOPStuff + .get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) + ? ItemList.Energy_Module + : ItemList.ZPM3, + 'C', ItemList.Emitter_UV, 'G', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'P', + ItemList.Field_Generator_UV }); ItemList.Machine_Multi_Assemblyline.set( new GT_MetaTileEntity_AssemblyLine(1170, "multimachine.assemblyline", "Assembling Line") .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Assemblyline.get(1L), bitsd, new Object[] { - aTextWireCoil, - "EME", - aTextWireCoil, - 'M', - ItemList.Hull_IV, - 'W', - ItemList.Casing_Assembler, - 'E', - OrePrefixes.circuit.get(Materials.Elite), - 'C', - ItemList.Robot_Arm_IV - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_Assemblyline.get(1L), + bitsd, + new Object[] { aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_IV, 'W', + ItemList.Casing_Assembler, 'E', OrePrefixes.circuit.get(Materials.Elite), 'C', + ItemList.Robot_Arm_IV }); ItemList.Machine_Multi_DieselEngine.set( new GT_MetaTileEntity_DieselEngine(1171, "multimachine.dieselengine", "Combustion Engine") .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_DieselEngine.get(1L), bitsd, new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_EV, - 'P', - ItemList.Electric_Piston_EV, - 'E', - ItemList.Electric_Motor_EV, - 'C', - OrePrefixes.circuit.get(Materials.Elite), - 'W', - OrePrefixes.cableGt01.get(Materials.TungstenSteel), - 'G', - OrePrefixes.gearGt.get(Materials.Titanium) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_EngineIntake.get(4L), bitsd, new Object[] { - "PhP", - "RFR", - aTextPlateWrench, - 'R', - OrePrefixes.pipeMedium.get(Materials.Titanium), - 'F', - ItemList.Casing_StableTitanium, - 'P', - OrePrefixes.rotor.get(Materials.Titanium) - }); - - ItemList.Machine_Multi_ExtremeDieselEngine.set(new GT_MetaTileEntity_ExtremeDieselEngine( - 2105, "multimachine.extremedieselengine", "Extreme Combustion Engine") - .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_ExtremeDieselEngine.get(1L), bitsd, new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_IV, - 'P', - ItemList.Electric_Piston_IV, - 'E', - ItemList.Electric_Motor_IV, - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'W', - OrePrefixes.cableGt01.get(Materials.HSSG), - 'G', - OrePrefixes.gearGt.get(Materials.TungstenSteel) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_ExtremeEngineIntake.get(4L), bitsd, new Object[] { - "PhP", - "RFR", - aTextPlateWrench, - 'R', - OrePrefixes.pipeMedium.get(Materials.TungstenSteel), - 'F', - ItemList.Casing_RobustTungstenSteel, - 'P', - OrePrefixes.rotor.get(Materials.TungstenSteel) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_DieselEngine.get(1L), + bitsd, + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', + ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.cableGt01.get(Materials.TungstenSteel), 'G', + OrePrefixes.gearGt.get(Materials.Titanium) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_EngineIntake.get(4L), + bitsd, + new Object[] { "PhP", "RFR", aTextPlateWrench, 'R', OrePrefixes.pipeMedium.get(Materials.Titanium), 'F', + ItemList.Casing_StableTitanium, 'P', OrePrefixes.rotor.get(Materials.Titanium) }); + + ItemList.Machine_Multi_ExtremeDieselEngine.set( + new GT_MetaTileEntity_ExtremeDieselEngine( + 2105, + "multimachine.extremedieselengine", + "Extreme Combustion Engine").getStackForm(1L)); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_ExtremeDieselEngine.get(1L), + bitsd, + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', + ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', + OrePrefixes.cableGt01.get(Materials.HSSG), 'G', + OrePrefixes.gearGt.get(Materials.TungstenSteel) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_ExtremeEngineIntake.get(4L), + bitsd, + new Object[] { "PhP", "RFR", aTextPlateWrench, 'R', OrePrefixes.pipeMedium.get(Materials.TungstenSteel), + 'F', ItemList.Casing_RobustTungstenSteel, 'P', + OrePrefixes.rotor.get(Materials.TungstenSteel) }); ItemList.Machine_Multi_Cleanroom.set( new GT_MetaTileEntity_Cleanroom(1172, "multimachine.cleanroom", "Cleanroom Controller") .getStackForm(1)); // If Cleanroom is enabled, add a recipe, else hide from NEI. if (GT_Mod.gregtechproxy.mEnableCleanroom) { - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Cleanroom.get(1L), bitsd, new Object[] { - "FFF", - "RHR", - "MCM", - 'H', - ItemList.Hull_HV, - 'F', - ItemList.Component_Filter, - 'R', - OrePrefixes.rotor.get(Materials.StainlessSteel), - 'M', - ItemList.Electric_Motor_HV, - 'C', - OrePrefixes.circuit.get(Materials.Advanced) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_Cleanroom.get(1L), + bitsd, + new Object[] { "FFF", "RHR", "MCM", 'H', ItemList.Hull_HV, 'F', ItemList.Component_Filter, 'R', + OrePrefixes.rotor.get(Materials.StainlessSteel), 'M', ItemList.Electric_Motor_HV, 'C', + OrePrefixes.circuit.get(Materials.Advanced) }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_HV.get(1L), - ItemList.Component_Filter.get(2L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L), - ItemList.Electric_Motor_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_HV.get(1L), ItemList.Component_Filter.get(2L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L), + ItemList.Electric_Motor_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + GT_Utility.getIntegratedCircuit(1) }, Materials.StainlessSteel.getMolten(864L), ItemList.Machine_Multi_Cleanroom.get(1L), 1200, @@ -12406,7 +9240,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC } } - ItemList.Machine_LV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ItemList.Machine_LV_CircuitAssembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1180, "basicmachine.circuitassembler.tier.01", "Basic Circuit Assembler", @@ -12424,25 +9259,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CIRCUITASSEMBLER", - new Object[] { - "ACE", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER - }) - .getStackForm(1L)); - ItemList.Machine_MV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACE", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER }).getStackForm(1L)); + ItemList.Machine_MV_CircuitAssembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1181, "basicmachine.circuitassembler.tier.02", "Advanced Circuit Assembler", @@ -12460,25 +9285,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CIRCUITASSEMBLER", - new Object[] { - "ACE", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER - }) - .getStackForm(1L)); - ItemList.Machine_HV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACE", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER }).getStackForm(1L)); + ItemList.Machine_HV_CircuitAssembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1182, "basicmachine.circuitassembler.tier.03", "Advanced Circuit Assembler II", @@ -12496,25 +9311,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CIRCUITASSEMBLER", - new Object[] { - "ACE", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER - }) - .getStackForm(1L)); - ItemList.Machine_EV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACE", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER }).getStackForm(1L)); + ItemList.Machine_EV_CircuitAssembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1183, "basicmachine.circuitassembler.tier.04", "Advanced Circuit Assembler III", @@ -12532,25 +9337,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CIRCUITASSEMBLER", - new Object[] { - "ACE", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER - }) - .getStackForm(1L)); - ItemList.Machine_IV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACE", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER }).getStackForm(1L)); + ItemList.Machine_IV_CircuitAssembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1184, "basicmachine.circuitassembler.tier.05", "Advanced Circuit Assembler IV", @@ -12568,25 +9363,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CIRCUITASSEMBLER", - new Object[] { - "ACE", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER - }) - .getStackForm(1L)); - ItemList.Machine_LuV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACE", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER }).getStackForm(1L)); + ItemList.Machine_LuV_CircuitAssembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1185, "basicmachine.circuitassembler.tier.06", "Advanced Circuit Assembler V", @@ -12604,25 +9389,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CIRCUITASSEMBLER", - new Object[] { - "ACE", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER - }) - .getStackForm(1L)); - ItemList.Machine_ZPM_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACE", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER }).getStackForm(1L)); + ItemList.Machine_ZPM_CircuitAssembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1186, "basicmachine.circuitassembler.tier.07", "Advanced Circuit Assembler VI", @@ -12640,25 +9415,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CIRCUITASSEMBLER", - new Object[] { - "ACE", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER - }) - .getStackForm(1L)); - ItemList.Machine_UV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACE", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER }).getStackForm(1L)); + ItemList.Machine_UV_CircuitAssembler.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1187, "basicmachine.circuitassembler.tier.08", "Advanced Circuit Assembler VII", @@ -12676,103 +9441,74 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, SpecialEffects.NONE, "CIRCUITASSEMBLER", - new Object[] { - "ACE", - "VMV", - aTextWireCoil, - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, - 'E', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER - }) - .getStackForm(1L)); + new Object[] { "ACE", "VMV", aTextWireCoil, 'M', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER }).getStackForm(1L)); ItemList.Machine_HV_LightningRod.set( new GT_MetaTileEntity_LightningRod(1174, "basicgenerator.lightningrod.03", "Lightning Rod", 3) .getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_LightningRod.get(1L), bitsd, new Object[] { - "LTL", - "TMT", - "LTL", - 'M', - ItemList.Hull_LuV, - 'L', - ItemList.Energy_LapotronicOrb, - 'T', - ItemList.Transformer_ZPM_LuV - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_HV_LightningRod.get(1L), + bitsd, + new Object[] { "LTL", "TMT", "LTL", 'M', ItemList.Hull_LuV, 'L', ItemList.Energy_LapotronicOrb, 'T', + ItemList.Transformer_ZPM_LuV }); ItemList.Machine_EV_LightningRod.set( new GT_MetaTileEntity_LightningRod(1175, "basicgenerator.lightningrod.04", "Lightning Rod II", 4) .getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_LightningRod.get(1L), bitsd, new Object[] { - "LTL", - "TMT", - "LTL", - 'M', - ItemList.Hull_ZPM, - 'L', - ItemList.Energy_LapotronicOrb2, - 'T', - ItemList.Transformer_UV_ZPM - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_EV_LightningRod.get(1L), + bitsd, + new Object[] { "LTL", "TMT", "LTL", 'M', ItemList.Hull_ZPM, 'L', ItemList.Energy_LapotronicOrb2, 'T', + ItemList.Transformer_UV_ZPM }); ItemList.Machine_IV_LightningRod.set( new GT_MetaTileEntity_LightningRod(1176, "basicgenerator.lightningrod.05", "Lightning Rod III", 5) .getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_LightningRod.get(1L), bitsd, new Object[] { - "LTL", "TMT", "LTL", 'M', ItemList.Hull_UV, 'L', ItemList.ZPM2, 'T', ItemList.Transformer_MAX_UV - }); - - ItemList.Machine_Multi_LargeChemicalReactor.set(new GT_MetaTileEntity_LargeChemicalReactor( - 1169, "multimachine.chemicalreactor", "Large Chemical Reactor") - .getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeChemicalReactor.get(1L), bitsd, new Object[] { - "CRC", - "PMP", - "CBC", - 'C', - OrePrefixes.circuit.get(Materials.Advanced), - 'R', - OrePrefixes.rotor.get(Materials.StainlessSteel), - 'P', - OrePrefixes.pipeLarge.get(Materials.Polytetrafluoroethylene), - 'M', - ItemList.Electric_Motor_HV, - 'B', - ItemList.Hull_HV - }); - - ItemList.PCBFactory.set( - new GT_MetaTileEntity_PCBFactory(356, "multimachine.pcbfactory", "PCB Factory").getStackForm(1)); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_IV_LightningRod.get(1L), + bitsd, + new Object[] { "LTL", "TMT", "LTL", 'M', ItemList.Hull_UV, 'L', ItemList.ZPM2, 'T', + ItemList.Transformer_MAX_UV }); + + ItemList.Machine_Multi_LargeChemicalReactor.set( + new GT_MetaTileEntity_LargeChemicalReactor( + 1169, + "multimachine.chemicalreactor", + "Large Chemical Reactor").getStackForm(1)); + GT_ModHandler.addCraftingRecipe( + ItemList.Machine_Multi_LargeChemicalReactor.get(1L), + bitsd, + new Object[] { "CRC", "PMP", "CBC", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'R', + OrePrefixes.rotor.get(Materials.StainlessSteel), 'P', + OrePrefixes.pipeLarge.get(Materials.Polytetrafluoroethylene), 'M', ItemList.Electric_Motor_HV, + 'B', ItemList.Hull_HV }); + + ItemList.PCBFactory + .set(new GT_MetaTileEntity_PCBFactory(356, "multimachine.pcbfactory", "PCB Factory").getStackForm(1)); GT_PCBFactoryMaterialLoader.load(); - ItemList.NanoForge.set( - new GT_MetaTileEntity_NanoForge(357, "multimachine.nanoforge", "Nano Forge").getStackForm(1)); + ItemList.NanoForge + .set(new GT_MetaTileEntity_NanoForge(357, "multimachine.nanoforge", "Nano Forge").getStackForm(1)); } private static void run4() { - long bits = GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + long bits = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED; for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) { if (((GregTech_API.sGeneratedMaterials[i] != null) - && ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x2) != 0)) + && ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x2) != 0)) || (GregTech_API.sGeneratedMaterials[i] == Materials.Wood)) { new GT_MetaPipeEntity_Frame( 4096 + i, "GT_Frame_" + GregTech_API.sGeneratedMaterials[i], - (GT_LanguageManager.i18nPlaceholder - ? "%material" - : GregTech_API.sGeneratedMaterials[i] != null - ? GregTech_API.sGeneratedMaterials[i].mDefaultLocalName - : "") + (GT_LanguageManager.i18nPlaceholder ? "%material" + : GregTech_API.sGeneratedMaterials[i] != null + ? GregTech_API.sGeneratedMaterials[i].mDefaultLocalName + : "") + " Frame Box", GregTech_API.sGeneratedMaterials[i]); } @@ -12789,7 +9525,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC makeWires(Materials.SolderingAlloy, 1280, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[1], true, false); makeWires( - Materials.Iron, 1300, bEC ? 3L : 4L, bEC ? 6L : 8L, 2L, gregtech.api.enums.GT_Values.V[2], true, false); + Materials.Iron, + 1300, + bEC ? 3L : 4L, + bEC ? 6L : 8L, + 2L, + gregtech.api.enums.GT_Values.V[2], + true, + false); makeWires( Materials.Nickel, 1320, @@ -13145,50 +9888,54 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("copperCableItem", 2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"xP", 'P', OrePrefixes.plate.get(Materials.AnyCopper)}); + new Object[] { "xP", 'P', OrePrefixes.plate.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("goldCableItem", 4L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"xP", 'P', OrePrefixes.plate.get(Materials.Gold)}); + new Object[] { "xP", 'P', OrePrefixes.plate.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("ironCableItem", 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"xP", 'P', OrePrefixes.plate.get(Materials.AnyIron)}); + new Object[] { "xP", 'P', OrePrefixes.plate.get(Materials.AnyIron) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("tinCableItem", 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"xP", 'P', OrePrefixes.plate.get(Materials.Tin)}); + new Object[] { "xP", 'P', OrePrefixes.plate.get(Materials.Tin) }); } GT_OreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(Materials.Wood), new GT_MetaPipeEntity_Fluid( - 5101, - "GT_Pipe_Wood_Small", - "Small Wooden Fluid Pipe", - 0.375F, - Materials.Wood, - 10, - 350, - false) - .getStackForm(1L)); + 5101, + "GT_Pipe_Wood_Small", + "Small Wooden Fluid Pipe", + 0.375F, + Materials.Wood, + 10, + 350, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(Materials.Wood), new GT_MetaPipeEntity_Fluid( - 5102, "GT_Pipe_Wood", "Wooden Fluid Pipe", 0.5F, Materials.Wood, 30, 350, false) - .getStackForm(1L)); + 5102, + "GT_Pipe_Wood", + "Wooden Fluid Pipe", + 0.5F, + Materials.Wood, + 30, + 350, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(Materials.Wood), new GT_MetaPipeEntity_Fluid( - 5103, - "GT_Pipe_Wood_Large", - "Large Wooden Fluid Pipe", - 0.75F, - Materials.Wood, - 60, - 350, - false) - .getStackForm(1L)); + 5103, + "GT_Pipe_Wood_Large", + "Large Wooden Fluid Pipe", + 0.75F, + Materials.Wood, + 60, + 350, + false).getStackForm(1L)); generateFluidPipes(Materials.Copper, Materials.Copper.mName, 5110, 20, 1000, true); generateFluidMultiPipes(Materials.Copper, Materials.Copper.mName, 5115, 20, 1000, true); @@ -13203,45 +9950,54 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC generateFluidPipes(Materials.TungstenSteel, Materials.TungstenSteel.mName, 5160, 600, 7500, true); generateFluidMultiPipes(Materials.TungstenSteel, Materials.TungstenSteel.mName, 5270, 600, 7500, true); generateFluidPipes( - Materials.Polybenzimidazole, Materials.Polybenzimidazole.mName, "PBI", 5280, 600, 1000, true); + Materials.Polybenzimidazole, + Materials.Polybenzimidazole.mName, + "PBI", + 5280, + 600, + 1000, + true); generateFluidMultiPipes( - Materials.Polybenzimidazole, Materials.Polybenzimidazole.mName, "PBI", 5290, 600, 1000, true); + Materials.Polybenzimidazole, + Materials.Polybenzimidazole.mName, + "PBI", + 5290, + 600, + 1000, + true); GT_OreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(Materials.Ultimate), new GT_MetaPipeEntity_Fluid( - 5165, - "GT_Pipe_HighPressure_Small", - "Small High Pressure Fluid Pipe", - 0.375F, - Materials.Redstone, - 4800, - 1500, - true) - .getStackForm(1L)); + 5165, + "GT_Pipe_HighPressure_Small", + "Small High Pressure Fluid Pipe", + 0.375F, + Materials.Redstone, + 4800, + 1500, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(Materials.Ultimate), new GT_MetaPipeEntity_Fluid( - 5166, - "GT_Pipe_HighPressure", - "High Pressure Fluid Pipe", - 0.5F, - Materials.Redstone, - 7200, - 1500, - true) - .getStackForm(1L)); + 5166, + "GT_Pipe_HighPressure", + "High Pressure Fluid Pipe", + 0.5F, + Materials.Redstone, + 7200, + 1500, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(Materials.Ultimate), new GT_MetaPipeEntity_Fluid( - 5167, - "GT_Pipe_HighPressure_Large", - "Large High Pressure Fluid Pipe", - 0.75F, - Materials.Redstone, - 9600, - 1500, - true) - .getStackForm(1L)); + 5167, + "GT_Pipe_HighPressure_Large", + "Large High Pressure Fluid Pipe", + 0.75F, + Materials.Redstone, + 9600, + 1500, + true).getStackForm(1L)); generateFluidPipes(Materials.Plastic, Materials.Plastic.mName, "Plastic", 5170, 360, 350, true); generateFluidMultiPipes(Materials.Plastic, Materials.Plastic.mName, "Plastic", 5175, 360, 350, true); generateFluidPipes( @@ -13263,36 +10019,37 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC generateFluidPipes(Materials.SpaceTime, Materials.SpaceTime.mName, 5300, 250000, 2147483647, true); generateFluidMultiPipes(Materials.SpaceTime, Materials.SpaceTime.mName, 5305, 250000, 2147483647, true); generateFluidPipes( - Materials.TranscendentMetal, Materials.TranscendentMetal.mName, 5310, 220000, 2147483647, true); + Materials.TranscendentMetal, + Materials.TranscendentMetal.mName, + 5310, + 220000, + 2147483647, + true); generateFluidMultiPipes( - Materials.TranscendentMetal, Materials.TranscendentMetal.mName, 5315, 220000, 2147483647, true); + Materials.TranscendentMetal, + Materials.TranscendentMetal.mName, + 5315, + 220000, + 2147483647, + true); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.TungstenSteel, 1L), - ItemList.Electric_Pump_EV.get(1L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.TungstenSteel, 1L), + ItemList.Electric_Pump_EV.get(1L), GT_Utility.getIntegratedCircuit(5) }, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 1L), 300, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1L), - ItemList.Electric_Pump_IV.get(1L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1L), + ItemList.Electric_Pump_IV.get(1L), GT_Utility.getIntegratedCircuit(5) }, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 1L), 400, 4096); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1L), - ItemList.Electric_Pump_IV.get(2L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1L), + ItemList.Electric_Pump_IV.get(2L), GT_Utility.getIntegratedCircuit(5) }, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 1L), 600, @@ -13307,157 +10064,111 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC generateItemPipes(Materials.Cobalt, Materials.Cobalt.mName, 5710, 2); generateItemPipes(Materials.Aluminium, Materials.Aluminium.mName, 5720, 2); - ItemList.Automation_ChestBuffer_ULV.set(new GT_MetaTileEntity_ChestBuffer( - 9230, "automation.chestbuffer.tier.00", "Ultra Low Voltage Chest Buffer", 0) - .getStackForm(1L)); + ItemList.Automation_ChestBuffer_ULV.set( + new GT_MetaTileEntity_ChestBuffer( + 9230, + "automation.chestbuffer.tier.00", + "Ultra Low Voltage Chest Buffer", + 0).getStackForm(1L)); ItemList.Automation_ChestBuffer_LV.set( new GT_MetaTileEntity_ChestBuffer(9231, "automation.chestbuffer.tier.01", "Low Voltage Chest Buffer", 1) .getStackForm(1L)); - ItemList.Automation_ChestBuffer_MV.set(new GT_MetaTileEntity_ChestBuffer( - 9232, "automation.chestbuffer.tier.02", "Medium Voltage Chest Buffer", 2) - .getStackForm(1L)); - ItemList.Automation_ChestBuffer_HV.set(new GT_MetaTileEntity_ChestBuffer( - 9233, "automation.chestbuffer.tier.03", "High Voltage Chest Buffer", 3) - .getStackForm(1L)); - ItemList.Automation_ChestBuffer_EV.set(new GT_MetaTileEntity_ChestBuffer( - 9234, "automation.chestbuffer.tier.04", "Extreme Voltage Chest Buffer", 4) - .getStackForm(1L)); - ItemList.Automation_ChestBuffer_IV.set(new GT_MetaTileEntity_ChestBuffer( - 9235, "automation.chestbuffer.tier.05", "Insane Voltage Chest Buffer", 5) - .getStackForm(1L)); - ItemList.Automation_ChestBuffer_LuV.set(new GT_MetaTileEntity_ChestBuffer( - 9236, "automation.chestbuffer.tier.06", "Ludicrous Voltage Chest Buffer", 6) - .getStackForm(1L)); + ItemList.Automation_ChestBuffer_MV.set( + new GT_MetaTileEntity_ChestBuffer( + 9232, + "automation.chestbuffer.tier.02", + "Medium Voltage Chest Buffer", + 2).getStackForm(1L)); + ItemList.Automation_ChestBuffer_HV.set( + new GT_MetaTileEntity_ChestBuffer( + 9233, + "automation.chestbuffer.tier.03", + "High Voltage Chest Buffer", + 3).getStackForm(1L)); + ItemList.Automation_ChestBuffer_EV.set( + new GT_MetaTileEntity_ChestBuffer( + 9234, + "automation.chestbuffer.tier.04", + "Extreme Voltage Chest Buffer", + 4).getStackForm(1L)); + ItemList.Automation_ChestBuffer_IV.set( + new GT_MetaTileEntity_ChestBuffer( + 9235, + "automation.chestbuffer.tier.05", + "Insane Voltage Chest Buffer", + 5).getStackForm(1L)); + ItemList.Automation_ChestBuffer_LuV.set( + new GT_MetaTileEntity_ChestBuffer( + 9236, + "automation.chestbuffer.tier.06", + "Ludicrous Voltage Chest Buffer", + 6).getStackForm(1L)); ItemList.Automation_ChestBuffer_ZPM.set( new GT_MetaTileEntity_ChestBuffer(9237, "automation.chestbuffer.tier.07", "ZPM Voltage Chest Buffer", 7) .getStackForm(1L)); - ItemList.Automation_ChestBuffer_UV.set(new GT_MetaTileEntity_ChestBuffer( - 9238, "automation.chestbuffer.tier.08", "Ultimate Voltage Chest Buffer", 8) - .getStackForm(1L)); - ItemList.Automation_ChestBuffer_MAX.set(new GT_MetaTileEntity_ChestBuffer( - 9239, "automation.chestbuffer.tier.09", "Highly Ultimate Voltage Chest Buffer", 9) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_ULV.get(1L), bits, new Object[] { - "CMV", - " X ", - 'M', - ItemList.Hull_ULV, - 'V', - ItemList.Conveyor_Module_LV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Primitive) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_LV.get(1L), bits, new Object[] { - "CMV", - " X ", - 'M', - ItemList.Hull_LV, - 'V', - ItemList.Conveyor_Module_LV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_MV.get(1L), bits, new Object[] { - "CMV", - " X ", - 'M', - ItemList.Hull_MV, - 'V', - ItemList.Conveyor_Module_MV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Good) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_HV.get(1L), bits, new Object[] { - "CMV", - " X ", - 'M', - ItemList.Hull_HV, - 'V', - ItemList.Conveyor_Module_HV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Advanced) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_EV.get(1L), bits, new Object[] { - "CMV", - " X ", - 'M', - ItemList.Hull_EV, - 'V', - ItemList.Conveyor_Module_EV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Data) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_IV.get(1L), bits, new Object[] { - "CMV", - " X ", - 'M', - ItemList.Hull_IV, - 'V', - ItemList.Conveyor_Module_IV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Elite) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_LuV.get(1L), bits, new Object[] { - "CMV", - " X ", - 'M', - ItemList.Hull_LuV, - 'V', - ItemList.Conveyor_Module_LuV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Master) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_ZPM.get(1L), bits, new Object[] { - "CMV", - " X ", - 'M', - ItemList.Hull_ZPM, - 'V', - ItemList.Conveyor_Module_ZPM, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Ultimate) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_UV.get(1L), bits, new Object[] { - "CMV", - " X ", - 'M', - ItemList.Hull_UV, - 'V', - ItemList.Conveyor_Module_UV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.SuperconductorUHV) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_MAX.get(1L), bits, new Object[] { - "CMV", - " X ", - 'M', - ItemList.Hull_MAX, - 'V', - ItemList.Conveyor_Module_UHV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Infinite) - }); + ItemList.Automation_ChestBuffer_UV.set( + new GT_MetaTileEntity_ChestBuffer( + 9238, + "automation.chestbuffer.tier.08", + "Ultimate Voltage Chest Buffer", + 8).getStackForm(1L)); + ItemList.Automation_ChestBuffer_MAX.set( + new GT_MetaTileEntity_ChestBuffer( + 9239, + "automation.chestbuffer.tier.09", + "Highly Ultimate Voltage Chest Buffer", + 9).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ChestBuffer_ULV.get(1L), + bits, + new Object[] { "CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Primitive) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ChestBuffer_LV.get(1L), + bits, + new Object[] { "CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ChestBuffer_MV.get(1L), + bits, + new Object[] { "CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ChestBuffer_HV.get(1L), + bits, + new Object[] { "CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Advanced) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ChestBuffer_EV.get(1L), + bits, + new Object[] { "CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Data) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ChestBuffer_IV.get(1L), + bits, + new Object[] { "CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Elite) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ChestBuffer_LuV.get(1L), + bits, + new Object[] { "CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Master) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ChestBuffer_ZPM.get(1L), + bits, + new Object[] { "CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Ultimate) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ChestBuffer_UV.get(1L), + bits, + new Object[] { "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.SuperconductorUHV) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ChestBuffer_MAX.get(1L), + bits, + new Object[] { "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Infinite) }); ItemList.Automation_Filter_ULV.set( new GT_MetaTileEntity_Filter(9240, "automation.filter.tier.00", "Ultra Low Voltage Item Filter", 0) @@ -13486,164 +10197,80 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Automation_Filter_UV.set( new GT_MetaTileEntity_Filter(9248, "automation.filter.tier.08", "Ultimate Voltage Item Filter", 8) .getStackForm(1L)); - ItemList.Automation_Filter_MAX.set(new GT_MetaTileEntity_Filter( - 9249, "automation.filter.tier.09", "Highly Ultimate Voltage Item Filter", 9) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_ULV.get(1L), bits, new Object[] { - " F ", - "CMV", - " X ", - 'M', - ItemList.Hull_ULV, - 'V', - ItemList.Conveyor_Module_LV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_LV.get(1L), bits, new Object[] { - " F ", - "CMV", - " X ", - 'M', - ItemList.Hull_LV, - 'V', - ItemList.Conveyor_Module_LV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_MV.get(1L), bits, new Object[] { - " F ", - "CMV", - " X ", - 'M', - ItemList.Hull_MV, - 'V', - ItemList.Conveyor_Module_MV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_HV.get(1L), bits, new Object[] { - " F ", - "CMV", - " X ", - 'M', - ItemList.Hull_HV, - 'V', - ItemList.Conveyor_Module_HV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_EV.get(1L), bits, new Object[] { - " F ", - "CMV", - " X ", - 'M', - ItemList.Hull_EV, - 'V', - ItemList.Conveyor_Module_EV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_IV.get(1L), bits, new Object[] { - " F ", - "CMV", - " X ", - 'M', - ItemList.Hull_IV, - 'V', - ItemList.Conveyor_Module_IV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_LuV.get(1L), bits, new Object[] { - " F ", - "CMV", - " X ", - 'M', - ItemList.Hull_LuV, - 'V', - ItemList.Conveyor_Module_LuV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_ZPM.get(1L), bits, new Object[] { - " F ", - "CMV", - " X ", - 'M', - ItemList.Hull_ZPM, - 'V', - ItemList.Conveyor_Module_ZPM, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_UV.get(1L), bits, new Object[] { - " F ", - "CMV", - " X ", - 'M', - ItemList.Hull_UV, - 'V', - ItemList.Conveyor_Module_UV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_MAX.get(1L), bits, new Object[] { - " F ", - "CMV", - " X ", - 'M', - ItemList.Hull_MAX, - 'V', - ItemList.Conveyor_Module_UHV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - - ItemList.Automation_TypeFilter_ULV.set(new GT_MetaTileEntity_TypeFilter( - 9250, "automation.typefilter.tier.00", "Ultra Low Voltage Type Filter", 0) - .getStackForm(1L)); + ItemList.Automation_Filter_MAX.set( + new GT_MetaTileEntity_Filter( + 9249, + "automation.filter.tier.09", + "Highly Ultimate Voltage Item Filter", + 9).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Filter_ULV.get(1L), + bits, + new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Filter_LV.get(1L), + bits, + new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Filter_MV.get(1L), + bits, + new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Filter_HV.get(1L), + bits, + new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Filter_EV.get(1L), + bits, + new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Filter_IV.get(1L), + bits, + new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Filter_LuV.get(1L), + bits, + new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Filter_ZPM.get(1L), + bits, + new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Filter_UV.get(1L), + bits, + new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Filter_MAX.get(1L), + bits, + new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + + ItemList.Automation_TypeFilter_ULV.set( + new GT_MetaTileEntity_TypeFilter( + 9250, + "automation.typefilter.tier.00", + "Ultra Low Voltage Type Filter", + 0).getStackForm(1L)); ItemList.Automation_TypeFilter_LV.set( new GT_MetaTileEntity_TypeFilter(9251, "automation.typefilter.tier.01", "Low Voltage Type Filter", 1) .getStackForm(1L)); @@ -13653,175 +10280,97 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Automation_TypeFilter_HV.set( new GT_MetaTileEntity_TypeFilter(9253, "automation.typefilter.tier.03", "High Voltage Type Filter", 3) .getStackForm(1L)); - ItemList.Automation_TypeFilter_EV.set(new GT_MetaTileEntity_TypeFilter( - 9254, "automation.typefilter.tier.04", "Extreme Voltage Type Filter", 4) - .getStackForm(1L)); + ItemList.Automation_TypeFilter_EV.set( + new GT_MetaTileEntity_TypeFilter( + 9254, + "automation.typefilter.tier.04", + "Extreme Voltage Type Filter", + 4).getStackForm(1L)); ItemList.Automation_TypeFilter_IV.set( new GT_MetaTileEntity_TypeFilter(9255, "automation.typefilter.tier.05", "Insane Voltage Type Filter", 5) .getStackForm(1L)); - ItemList.Automation_TypeFilter_LuV.set(new GT_MetaTileEntity_TypeFilter( - 9256, "automation.typefilter.tier.06", "Ludicrous Voltage Type Filter", 6) - .getStackForm(1L)); + ItemList.Automation_TypeFilter_LuV.set( + new GT_MetaTileEntity_TypeFilter( + 9256, + "automation.typefilter.tier.06", + "Ludicrous Voltage Type Filter", + 6).getStackForm(1L)); ItemList.Automation_TypeFilter_ZPM.set( new GT_MetaTileEntity_TypeFilter(9257, "automation.typefilter.tier.07", "ZPM Voltage Type Filter", 7) .getStackForm(1L)); - ItemList.Automation_TypeFilter_UV.set(new GT_MetaTileEntity_TypeFilter( - 9258, "automation.typefilter.tier.08", "Ultimate Voltage Type Filter", 8) - .getStackForm(1L)); - ItemList.Automation_TypeFilter_MAX.set(new GT_MetaTileEntity_TypeFilter( - 9259, "automation.typefilter.tier.09", "Highly Ultimate Voltage Type Filter", 9) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_ULV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_ULV, - 'V', - ItemList.Conveyor_Module_LV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_LV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_LV, - 'V', - ItemList.Conveyor_Module_LV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_MV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_MV, - 'V', - ItemList.Conveyor_Module_MV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_HV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_HV, - 'V', - ItemList.Conveyor_Module_HV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_EV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_EV, - 'V', - ItemList.Conveyor_Module_EV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_IV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_IV, - 'V', - ItemList.Conveyor_Module_IV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_LuV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_LuV, - 'V', - ItemList.Conveyor_Module_LuV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_ZPM.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_ZPM, - 'V', - ItemList.Conveyor_Module_ZPM, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_UV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_UV, - 'V', - ItemList.Conveyor_Module_UV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_MAX.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_MAX, - 'V', - ItemList.Conveyor_Module_UHV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); + ItemList.Automation_TypeFilter_UV.set( + new GT_MetaTileEntity_TypeFilter( + 9258, + "automation.typefilter.tier.08", + "Ultimate Voltage Type Filter", + 8).getStackForm(1L)); + ItemList.Automation_TypeFilter_MAX.set( + new GT_MetaTileEntity_TypeFilter( + 9259, + "automation.typefilter.tier.09", + "Highly Ultimate Voltage Type Filter", + 9).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_TypeFilter_ULV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_TypeFilter_LV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_TypeFilter_MV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_TypeFilter_HV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_TypeFilter_EV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_TypeFilter_IV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_TypeFilter_LuV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_TypeFilter_ZPM.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_TypeFilter_UV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_TypeFilter_MAX.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); ItemList.Automation_Regulator_ULV.set( new GT_MetaTileEntity_Regulator(9270, "automation.regulator.tier.00", "Ultra Low Voltage Regulator", 0) @@ -13850,815 +10399,639 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Automation_Regulator_UV.set( new GT_MetaTileEntity_Regulator(9278, "automation.regulator.tier.08", "Ultimate Voltage Regulator", 8) .getStackForm(1L)); - ItemList.Automation_Regulator_MAX.set(new GT_MetaTileEntity_Regulator( - 9279, "automation.regulator.tier.09", "Highly Ultimate Voltage Regulator", 9) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_ULV.get(1L), bits, new Object[] { - "XFX", - "VMV", - "XCX", - 'M', - ItemList.Hull_ULV, - 'V', - ItemList.Robot_Arm_LV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_LV.get(1L), bits, new Object[] { - "XFX", - "VMV", - "XCX", - 'M', - ItemList.Hull_LV, - 'V', - ItemList.Robot_Arm_LV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_MV.get(1L), bits, new Object[] { - "XFX", - "VMV", - "XCX", - 'M', - ItemList.Hull_MV, - 'V', - ItemList.Robot_Arm_MV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_HV.get(1L), bits, new Object[] { - "XFX", - "VMV", - "XCX", - 'M', - ItemList.Hull_HV, - 'V', - ItemList.Robot_Arm_HV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_EV.get(1L), bits, new Object[] { - "XFX", - "VMV", - "XCX", - 'M', - ItemList.Hull_EV, - 'V', - ItemList.Robot_Arm_EV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_IV.get(1L), bits, new Object[] { - "XFX", - "VMV", - "XCX", - 'M', - ItemList.Hull_IV, - 'V', - ItemList.Robot_Arm_IV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_LuV.get(1L), bits, new Object[] { - "XFX", - "VMV", - "XCX", - 'M', - ItemList.Hull_LuV, - 'V', - ItemList.Robot_Arm_LuV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_ZPM.get(1L), bits, new Object[] { - "XFX", - "VMV", - "XCX", - 'M', - ItemList.Hull_ZPM, - 'V', - ItemList.Robot_Arm_ZPM, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_UV.get(1L), bits, new Object[] { - "XFX", - "VMV", - "XCX", - 'M', - ItemList.Hull_UV, - 'V', - ItemList.Robot_Arm_UV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_MAX.get(1L), bits, new Object[] { - "XFX", - "VMV", - "XCX", - 'M', - ItemList.Hull_MAX, - 'V', - ItemList.Robot_Arm_UHV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - - ItemList.Automation_SuperBuffer_ULV.set(new GT_MetaTileEntity_SuperBuffer( - 9300, "automation.superbuffer.tier.00", "Ultra Low Voltage Super Buffer", 0) - .getStackForm(1L)); + ItemList.Automation_Regulator_MAX.set( + new GT_MetaTileEntity_Regulator( + 9279, + "automation.regulator.tier.09", + "Highly Ultimate Voltage Regulator", + 9).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Regulator_ULV.get(1L), + bits, + new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_ULV, 'V', ItemList.Robot_Arm_LV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Regulator_LV.get(1L), + bits, + new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_LV, 'V', ItemList.Robot_Arm_LV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Regulator_MV.get(1L), + bits, + new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_MV, 'V', ItemList.Robot_Arm_MV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Regulator_HV.get(1L), + bits, + new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_HV, 'V', ItemList.Robot_Arm_HV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Regulator_EV.get(1L), + bits, + new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_EV, 'V', ItemList.Robot_Arm_EV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Regulator_IV.get(1L), + bits, + new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_IV, 'V', ItemList.Robot_Arm_IV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Regulator_LuV.get(1L), + bits, + new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_LuV, 'V', ItemList.Robot_Arm_LuV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Regulator_ZPM.get(1L), + bits, + new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_ZPM, 'V', ItemList.Robot_Arm_ZPM, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Regulator_UV.get(1L), + bits, + new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_UV, 'V', ItemList.Robot_Arm_UV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_Regulator_MAX.get(1L), + bits, + new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_MAX, 'V', ItemList.Robot_Arm_UHV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + + ItemList.Automation_SuperBuffer_ULV.set( + new GT_MetaTileEntity_SuperBuffer( + 9300, + "automation.superbuffer.tier.00", + "Ultra Low Voltage Super Buffer", + 0).getStackForm(1L)); ItemList.Automation_SuperBuffer_LV.set( new GT_MetaTileEntity_SuperBuffer(9301, "automation.superbuffer.tier.01", "Low Voltage Super Buffer", 1) .getStackForm(1L)); - ItemList.Automation_SuperBuffer_MV.set(new GT_MetaTileEntity_SuperBuffer( - 9302, "automation.superbuffer.tier.02", "Medium Voltage Super Buffer", 2) - .getStackForm(1L)); - ItemList.Automation_SuperBuffer_HV.set(new GT_MetaTileEntity_SuperBuffer( - 9303, "automation.superbuffer.tier.03", "High Voltage Super Buffer", 3) - .getStackForm(1L)); - ItemList.Automation_SuperBuffer_EV.set(new GT_MetaTileEntity_SuperBuffer( - 9304, "automation.superbuffer.tier.04", "Extreme Voltage Super Buffer", 4) - .getStackForm(1L)); - ItemList.Automation_SuperBuffer_IV.set(new GT_MetaTileEntity_SuperBuffer( - 9305, "automation.superbuffer.tier.05", "Insane Voltage Super Buffer", 5) - .getStackForm(1L)); - ItemList.Automation_SuperBuffer_LuV.set(new GT_MetaTileEntity_SuperBuffer( - 9306, "automation.superbuffer.tier.06", "Ludicrous Voltage Super Buffer", 6) - .getStackForm(1L)); + ItemList.Automation_SuperBuffer_MV.set( + new GT_MetaTileEntity_SuperBuffer( + 9302, + "automation.superbuffer.tier.02", + "Medium Voltage Super Buffer", + 2).getStackForm(1L)); + ItemList.Automation_SuperBuffer_HV.set( + new GT_MetaTileEntity_SuperBuffer( + 9303, + "automation.superbuffer.tier.03", + "High Voltage Super Buffer", + 3).getStackForm(1L)); + ItemList.Automation_SuperBuffer_EV.set( + new GT_MetaTileEntity_SuperBuffer( + 9304, + "automation.superbuffer.tier.04", + "Extreme Voltage Super Buffer", + 4).getStackForm(1L)); + ItemList.Automation_SuperBuffer_IV.set( + new GT_MetaTileEntity_SuperBuffer( + 9305, + "automation.superbuffer.tier.05", + "Insane Voltage Super Buffer", + 5).getStackForm(1L)); + ItemList.Automation_SuperBuffer_LuV.set( + new GT_MetaTileEntity_SuperBuffer( + 9306, + "automation.superbuffer.tier.06", + "Ludicrous Voltage Super Buffer", + 6).getStackForm(1L)); ItemList.Automation_SuperBuffer_ZPM.set( new GT_MetaTileEntity_SuperBuffer(9307, "automation.superbuffer.tier.07", "ZPM Voltage Super Buffer", 7) .getStackForm(1L)); - ItemList.Automation_SuperBuffer_UV.set(new GT_MetaTileEntity_SuperBuffer( - 9308, "automation.superbuffer.tier.08", "Ultimate Voltage Super Buffer", 8) - .getStackForm(1L)); - ItemList.Automation_SuperBuffer_MAX.set(new GT_MetaTileEntity_SuperBuffer( - 9309, "automation.superbuffer.tier.09", "Highly Ultimate Voltage Super Buffer", 9) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ULV.get(1L), bits, new Object[] { - "DMV", - 'M', - ItemList.Automation_ChestBuffer_ULV, - 'V', - ItemList.Conveyor_Module_LV, - 'D', - ItemList.Tool_DataOrb - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LV.get(1L), bits, new Object[] { - "DMV", 'M', ItemList.Automation_ChestBuffer_LV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataOrb - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MV.get(1L), bits, new Object[] { - "DMV", 'M', ItemList.Automation_ChestBuffer_MV, 'V', ItemList.Conveyor_Module_MV, 'D', ItemList.Tool_DataOrb - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_HV.get(1L), bits, new Object[] { - "DMV", 'M', ItemList.Automation_ChestBuffer_HV, 'V', ItemList.Conveyor_Module_HV, 'D', ItemList.Tool_DataOrb - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_EV.get(1L), bits, new Object[] { - "DMV", 'M', ItemList.Automation_ChestBuffer_EV, 'V', ItemList.Conveyor_Module_EV, 'D', ItemList.Tool_DataOrb - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_IV.get(1L), bits, new Object[] { - "DMV", 'M', ItemList.Automation_ChestBuffer_IV, 'V', ItemList.Conveyor_Module_IV, 'D', ItemList.Tool_DataOrb - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LuV.get(1L), bits, new Object[] { - "DMV", - 'M', - ItemList.Automation_ChestBuffer_LuV, - 'V', - ItemList.Conveyor_Module_LuV, - 'D', - ItemList.Tool_DataOrb - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ZPM.get(1L), bits, new Object[] { - "DMV", - 'M', - ItemList.Automation_ChestBuffer_ZPM, - 'V', - ItemList.Conveyor_Module_ZPM, - 'D', - ItemList.Tool_DataOrb - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_UV.get(1L), bits, new Object[] { - "DMV", 'M', ItemList.Automation_ChestBuffer_UV, 'V', ItemList.Conveyor_Module_UV, 'D', ItemList.Tool_DataOrb - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MAX.get(1L), bits, new Object[] { - "DMV", - 'M', - ItemList.Automation_ChestBuffer_MAX, - 'V', - ItemList.Conveyor_Module_UHV, - 'D', - ItemList.Tool_DataOrb - }); - - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ULV.get(1L), bits, new Object[] { - "DMV", "DDD", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataStick - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LV.get(1L), bits, new Object[] { - "DMV", "DDD", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataStick - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MV.get(1L), bits, new Object[] { - "DMV", "DDD", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'D', ItemList.Tool_DataStick - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_HV.get(1L), bits, new Object[] { - "DMV", "DDD", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'D', ItemList.Tool_DataStick - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_EV.get(1L), bits, new Object[] { - "DMV", "DDD", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'D', ItemList.Tool_DataStick - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_IV.get(1L), bits, new Object[] { - "DMV", "DDD", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'D', ItemList.Tool_DataStick - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LuV.get(1L), bits, new Object[] { - "DMV", "DDD", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'D', ItemList.Tool_DataStick - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ZPM.get(1L), bits, new Object[] { - "DMV", "DDD", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'D', ItemList.Tool_DataStick - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_UV.get(1L), bits, new Object[] { - "DMV", "DDD", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'D', ItemList.Tool_DataStick - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MAX.get(1L), bits, new Object[] { - "DMV", "DDD", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'D', ItemList.Tool_DataStick - }); - - ItemList.Automation_ItemDistributor_ULV.set(new GT_MetaTileEntity_ItemDistributor( - 9320, "automation.itemdistributor.tier.00", "Ultra Low Voltage Item Distributor", 0) - .getStackForm(1L)); - ItemList.Automation_ItemDistributor_LV.set(new GT_MetaTileEntity_ItemDistributor( - 9321, "automation.itemdistributor.tier.01", "Low Voltage Item Distributor", 1) - .getStackForm(1L)); - ItemList.Automation_ItemDistributor_MV.set(new GT_MetaTileEntity_ItemDistributor( - 9322, "automation.itemdistributor.tier.02", "Medium Voltage Item Distributor", 2) - .getStackForm(1L)); - ItemList.Automation_ItemDistributor_HV.set(new GT_MetaTileEntity_ItemDistributor( - 9323, "automation.itemdistributor.tier.03", "High Voltage Item Distributor", 3) - .getStackForm(1L)); - ItemList.Automation_ItemDistributor_EV.set(new GT_MetaTileEntity_ItemDistributor( - 9324, "automation.itemdistributor.tier.04", "Extreme Voltage Item Distributor", 4) - .getStackForm(1L)); - ItemList.Automation_ItemDistributor_IV.set(new GT_MetaTileEntity_ItemDistributor( - 9325, "automation.itemdistributor.tier.05", "Insane Voltage Item Distributor", 5) - .getStackForm(1L)); - ItemList.Automation_ItemDistributor_LuV.set(new GT_MetaTileEntity_ItemDistributor( - 9326, "automation.itemdistributor.tier.06", "Ludicrous Voltage Item Distributor", 6) - .getStackForm(1L)); - ItemList.Automation_ItemDistributor_ZPM.set(new GT_MetaTileEntity_ItemDistributor( - 9327, "automation.itemdistributor.tier.07", "ZPM Voltage Item Distributor", 7) - .getStackForm(1L)); - ItemList.Automation_ItemDistributor_UV.set(new GT_MetaTileEntity_ItemDistributor( - 9328, "automation.itemdistributor.tier.08", "Ultimate Voltage Item Distributor", 8) - .getStackForm(1L)); - ItemList.Automation_ItemDistributor_MAX.set(new GT_MetaTileEntity_ItemDistributor( - 9329, "automation.itemdistributor.tier.09", "MAX Voltage Item Distributor", 9) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_ULV.get(1L), bits, new Object[] { - "XCX", - "VMV", - " V ", - 'M', - ItemList.Hull_ULV, - 'V', - ItemList.Conveyor_Module_LV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_LV.get(1L), bits, new Object[] { - "XCX", - "VMV", - " V ", - 'M', - ItemList.Hull_LV, - 'V', - ItemList.Conveyor_Module_LV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_MV.get(1L), bits, new Object[] { - "XCX", - "VMV", - " V ", - 'M', - ItemList.Hull_MV, - 'V', - ItemList.Conveyor_Module_MV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_HV.get(1L), bits, new Object[] { - "XCX", - "VMV", - " V ", - 'M', - ItemList.Hull_HV, - 'V', - ItemList.Conveyor_Module_HV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_EV.get(1L), bits, new Object[] { - "XCX", - "VMV", - " V ", - 'M', - ItemList.Hull_EV, - 'V', - ItemList.Conveyor_Module_EV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_IV.get(1L), bits, new Object[] { - "XCX", - "VMV", - " V ", - 'M', - ItemList.Hull_IV, - 'V', - ItemList.Conveyor_Module_IV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_LuV.get(1L), bits, new Object[] { - "XCX", - "VMV", - " V ", - 'M', - ItemList.Hull_LuV, - 'V', - ItemList.Conveyor_Module_LuV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_ZPM.get(1L), bits, new Object[] { - "XCX", - "VMV", - " V ", - 'M', - ItemList.Hull_ZPM, - 'V', - ItemList.Conveyor_Module_ZPM, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_UV.get(1L), bits, new Object[] { - "XCX", - "VMV", - " V ", - 'M', - ItemList.Hull_UV, - 'V', - ItemList.Conveyor_Module_UV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_MAX.get(1L), bits, new Object[] { - "XCX", - "VMV", - " V ", - 'M', - ItemList.Hull_MAX, - 'V', - ItemList.Conveyor_Module_UHV, - 'C', - OreDictNames.craftingChest, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - - ItemList.Automation_RecipeFilter_ULV.set(new GT_MetaTileEntity_RecipeFilter( - 9330, "automation.recipefilter.tier.00", "Ultra Low Voltage Recipe Filter", 0) - .getStackForm(1L)); - ItemList.Automation_RecipeFilter_LV.set(new GT_MetaTileEntity_RecipeFilter( - 9331, "automation.recipefilter.tier.01", "Low Voltage Recipe Filter", 1) - .getStackForm(1L)); - ItemList.Automation_RecipeFilter_MV.set(new GT_MetaTileEntity_RecipeFilter( - 9332, "automation.recipefilter.tier.02", "Medium Voltage Recipe Filter", 2) - .getStackForm(1L)); - ItemList.Automation_RecipeFilter_HV.set(new GT_MetaTileEntity_RecipeFilter( - 9333, "automation.recipefilter.tier.03", "High Voltage Recipe Filter", 3) - .getStackForm(1L)); - ItemList.Automation_RecipeFilter_EV.set(new GT_MetaTileEntity_RecipeFilter( - 9334, "automation.recipefilter.tier.04", "Extreme Voltage Recipe Filter", 4) - .getStackForm(1L)); - ItemList.Automation_RecipeFilter_IV.set(new GT_MetaTileEntity_RecipeFilter( - 9335, "automation.recipefilter.tier.05", "Insane Voltage Recipe Filter", 5) - .getStackForm(1L)); - ItemList.Automation_RecipeFilter_LuV.set(new GT_MetaTileEntity_RecipeFilter( - 9336, "automation.recipefilter.tier.06", "Ludicrous Voltage Recipe Filter", 6) - .getStackForm(1L)); - ItemList.Automation_RecipeFilter_ZPM.set(new GT_MetaTileEntity_RecipeFilter( - 9337, "automation.recipefilter.tier.07", "ZPM Voltage Recipe Filter", 7) - .getStackForm(1L)); - ItemList.Automation_RecipeFilter_UV.set(new GT_MetaTileEntity_RecipeFilter( - 9338, "automation.recipefilter.tier.08", "Ultimate Voltage Recipe Filter", 8) - .getStackForm(1L)); - ItemList.Automation_RecipeFilter_MAX.set(new GT_MetaTileEntity_RecipeFilter( - 9339, "automation.recipefilter.tier.09", "Highly Ultimate Voltage Recipe Filter", 9) - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Automation_RecipeFilter_ULV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_ULV, - 'V', - ItemList.Robot_Arm_LV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_RecipeFilter_LV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_LV, - 'V', - ItemList.Robot_Arm_LV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_RecipeFilter_MV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_MV, - 'V', - ItemList.Robot_Arm_MV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_RecipeFilter_HV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_HV, - 'V', - ItemList.Robot_Arm_HV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_RecipeFilter_EV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_EV, - 'V', - ItemList.Robot_Arm_EV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_RecipeFilter_IV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_IV, - 'V', - ItemList.Robot_Arm_IV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_RecipeFilter_LuV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_LuV, - 'V', - ItemList.Robot_Arm_LuV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_RecipeFilter_ZPM.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_ZPM, - 'V', - ItemList.Robot_Arm_ZPM, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_RecipeFilter_UV.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_UV, - 'V', - ItemList.Robot_Arm_UV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_RecipeFilter_MAX.get(1L), bits, new Object[] { - " F ", - "VMC", - " X ", - 'M', - ItemList.Hull_MAX, - 'V', - ItemList.Robot_Arm_UHV, - 'C', - OreDictNames.craftingChest, - 'F', - OreDictNames.craftingFilter, - 'X', - OrePrefixes.circuit.get(Materials.Basic) - }); + ItemList.Automation_SuperBuffer_UV.set( + new GT_MetaTileEntity_SuperBuffer( + 9308, + "automation.superbuffer.tier.08", + "Ultimate Voltage Super Buffer", + 8).getStackForm(1L)); + ItemList.Automation_SuperBuffer_MAX.set( + new GT_MetaTileEntity_SuperBuffer( + 9309, + "automation.superbuffer.tier.09", + "Highly Ultimate Voltage Super Buffer", + 9).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_ULV.get(1L), + bits, + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_ULV, 'V', ItemList.Conveyor_Module_LV, 'D', + ItemList.Tool_DataOrb }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_LV.get(1L), + bits, + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_LV, 'V', ItemList.Conveyor_Module_LV, 'D', + ItemList.Tool_DataOrb }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_MV.get(1L), + bits, + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_MV, 'V', ItemList.Conveyor_Module_MV, 'D', + ItemList.Tool_DataOrb }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_HV.get(1L), + bits, + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_HV, 'V', ItemList.Conveyor_Module_HV, 'D', + ItemList.Tool_DataOrb }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_EV.get(1L), + bits, + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_EV, 'V', ItemList.Conveyor_Module_EV, 'D', + ItemList.Tool_DataOrb }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_IV.get(1L), + bits, + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_IV, 'V', ItemList.Conveyor_Module_IV, 'D', + ItemList.Tool_DataOrb }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_LuV.get(1L), + bits, + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_LuV, 'V', ItemList.Conveyor_Module_LuV, 'D', + ItemList.Tool_DataOrb }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_ZPM.get(1L), + bits, + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'D', + ItemList.Tool_DataOrb }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_UV.get(1L), + bits, + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_UV, 'V', ItemList.Conveyor_Module_UV, 'D', + ItemList.Tool_DataOrb }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_MAX.get(1L), + bits, + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_MAX, 'V', ItemList.Conveyor_Module_UHV, 'D', + ItemList.Tool_DataOrb }); + + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_ULV.get(1L), + bits, + new Object[] { "DMV", "DDD", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'D', + ItemList.Tool_DataStick }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_LV.get(1L), + bits, + new Object[] { "DMV", "DDD", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'D', + ItemList.Tool_DataStick }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_MV.get(1L), + bits, + new Object[] { "DMV", "DDD", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'D', + ItemList.Tool_DataStick }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_HV.get(1L), + bits, + new Object[] { "DMV", "DDD", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'D', + ItemList.Tool_DataStick }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_EV.get(1L), + bits, + new Object[] { "DMV", "DDD", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'D', + ItemList.Tool_DataStick }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_IV.get(1L), + bits, + new Object[] { "DMV", "DDD", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'D', + ItemList.Tool_DataStick }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_LuV.get(1L), + bits, + new Object[] { "DMV", "DDD", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'D', + ItemList.Tool_DataStick }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_ZPM.get(1L), + bits, + new Object[] { "DMV", "DDD", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'D', + ItemList.Tool_DataStick }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_UV.get(1L), + bits, + new Object[] { "DMV", "DDD", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'D', + ItemList.Tool_DataStick }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_SuperBuffer_MAX.get(1L), + bits, + new Object[] { "DMV", "DDD", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'D', + ItemList.Tool_DataStick }); + + ItemList.Automation_ItemDistributor_ULV.set( + new GT_MetaTileEntity_ItemDistributor( + 9320, + "automation.itemdistributor.tier.00", + "Ultra Low Voltage Item Distributor", + 0).getStackForm(1L)); + ItemList.Automation_ItemDistributor_LV.set( + new GT_MetaTileEntity_ItemDistributor( + 9321, + "automation.itemdistributor.tier.01", + "Low Voltage Item Distributor", + 1).getStackForm(1L)); + ItemList.Automation_ItemDistributor_MV.set( + new GT_MetaTileEntity_ItemDistributor( + 9322, + "automation.itemdistributor.tier.02", + "Medium Voltage Item Distributor", + 2).getStackForm(1L)); + ItemList.Automation_ItemDistributor_HV.set( + new GT_MetaTileEntity_ItemDistributor( + 9323, + "automation.itemdistributor.tier.03", + "High Voltage Item Distributor", + 3).getStackForm(1L)); + ItemList.Automation_ItemDistributor_EV.set( + new GT_MetaTileEntity_ItemDistributor( + 9324, + "automation.itemdistributor.tier.04", + "Extreme Voltage Item Distributor", + 4).getStackForm(1L)); + ItemList.Automation_ItemDistributor_IV.set( + new GT_MetaTileEntity_ItemDistributor( + 9325, + "automation.itemdistributor.tier.05", + "Insane Voltage Item Distributor", + 5).getStackForm(1L)); + ItemList.Automation_ItemDistributor_LuV.set( + new GT_MetaTileEntity_ItemDistributor( + 9326, + "automation.itemdistributor.tier.06", + "Ludicrous Voltage Item Distributor", + 6).getStackForm(1L)); + ItemList.Automation_ItemDistributor_ZPM.set( + new GT_MetaTileEntity_ItemDistributor( + 9327, + "automation.itemdistributor.tier.07", + "ZPM Voltage Item Distributor", + 7).getStackForm(1L)); + ItemList.Automation_ItemDistributor_UV.set( + new GT_MetaTileEntity_ItemDistributor( + 9328, + "automation.itemdistributor.tier.08", + "Ultimate Voltage Item Distributor", + 8).getStackForm(1L)); + ItemList.Automation_ItemDistributor_MAX.set( + new GT_MetaTileEntity_ItemDistributor( + 9329, + "automation.itemdistributor.tier.09", + "MAX Voltage Item Distributor", + 9).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ItemDistributor_ULV.get(1L), + bits, + new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ItemDistributor_LV.get(1L), + bits, + new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ItemDistributor_MV.get(1L), + bits, + new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ItemDistributor_HV.get(1L), + bits, + new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ItemDistributor_EV.get(1L), + bits, + new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ItemDistributor_IV.get(1L), + bits, + new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ItemDistributor_LuV.get(1L), + bits, + new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ItemDistributor_ZPM.get(1L), + bits, + new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ItemDistributor_UV.get(1L), + bits, + new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_ItemDistributor_MAX.get(1L), + bits, + new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C', + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + + ItemList.Automation_RecipeFilter_ULV.set( + new GT_MetaTileEntity_RecipeFilter( + 9330, + "automation.recipefilter.tier.00", + "Ultra Low Voltage Recipe Filter", + 0).getStackForm(1L)); + ItemList.Automation_RecipeFilter_LV.set( + new GT_MetaTileEntity_RecipeFilter( + 9331, + "automation.recipefilter.tier.01", + "Low Voltage Recipe Filter", + 1).getStackForm(1L)); + ItemList.Automation_RecipeFilter_MV.set( + new GT_MetaTileEntity_RecipeFilter( + 9332, + "automation.recipefilter.tier.02", + "Medium Voltage Recipe Filter", + 2).getStackForm(1L)); + ItemList.Automation_RecipeFilter_HV.set( + new GT_MetaTileEntity_RecipeFilter( + 9333, + "automation.recipefilter.tier.03", + "High Voltage Recipe Filter", + 3).getStackForm(1L)); + ItemList.Automation_RecipeFilter_EV.set( + new GT_MetaTileEntity_RecipeFilter( + 9334, + "automation.recipefilter.tier.04", + "Extreme Voltage Recipe Filter", + 4).getStackForm(1L)); + ItemList.Automation_RecipeFilter_IV.set( + new GT_MetaTileEntity_RecipeFilter( + 9335, + "automation.recipefilter.tier.05", + "Insane Voltage Recipe Filter", + 5).getStackForm(1L)); + ItemList.Automation_RecipeFilter_LuV.set( + new GT_MetaTileEntity_RecipeFilter( + 9336, + "automation.recipefilter.tier.06", + "Ludicrous Voltage Recipe Filter", + 6).getStackForm(1L)); + ItemList.Automation_RecipeFilter_ZPM.set( + new GT_MetaTileEntity_RecipeFilter( + 9337, + "automation.recipefilter.tier.07", + "ZPM Voltage Recipe Filter", + 7).getStackForm(1L)); + ItemList.Automation_RecipeFilter_UV.set( + new GT_MetaTileEntity_RecipeFilter( + 9338, + "automation.recipefilter.tier.08", + "Ultimate Voltage Recipe Filter", + 8).getStackForm(1L)); + ItemList.Automation_RecipeFilter_MAX.set( + new GT_MetaTileEntity_RecipeFilter( + 9339, + "automation.recipefilter.tier.09", + "Highly Ultimate Voltage Recipe Filter", + 9).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_RecipeFilter_ULV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Robot_Arm_LV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_RecipeFilter_LV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Robot_Arm_LV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_RecipeFilter_MV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Robot_Arm_MV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_RecipeFilter_HV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Robot_Arm_HV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_RecipeFilter_EV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Robot_Arm_EV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_RecipeFilter_IV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Robot_Arm_IV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_RecipeFilter_LuV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Robot_Arm_LuV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_RecipeFilter_ZPM.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Robot_Arm_ZPM, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_RecipeFilter_UV.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Robot_Arm_UV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Automation_RecipeFilter_MAX.get(1L), + bits, + new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Robot_Arm_UHV, 'C', + OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', + OrePrefixes.circuit.get(Materials.Basic) }); } @SuppressWarnings("PointlessArithmeticExpression") - private static void makeWires( - Materials aMaterial, - int aStartID, - long aLossInsulated, - long aLoss, - long aAmperage, - long aVoltage, - boolean aInsulatable, - boolean aAutoInsulated) { + private static void makeWires(Materials aMaterial, int aStartID, long aLossInsulated, long aLoss, long aAmperage, + long aVoltage, boolean aInsulatable, boolean aAutoInsulated) { String name = GT_LanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName; GT_OreDictUnificator.registerOre( OrePrefixes.wireGt01, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 0, - aTextWire1 + aMaterial.mName.toLowerCase() + ".01", - "1x " + name + aTextWire2, - 0.125F, - aMaterial, - aLoss, - 1L * aAmperage, - aVoltage, - false, - !aAutoInsulated) - .getStackForm(1L)); + aStartID + 0, + aTextWire1 + aMaterial.mName.toLowerCase() + ".01", + "1x " + name + aTextWire2, + 0.125F, + aMaterial, + aLoss, + 1L * aAmperage, + aVoltage, + false, + !aAutoInsulated).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt02, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 1, - aTextWire1 + aMaterial.mName.toLowerCase() + ".02", - "2x " + name + aTextWire2, - 0.25F, - aMaterial, - aLoss, - 2L * aAmperage, - aVoltage, - false, - !aAutoInsulated) - .getStackForm(1L)); + aStartID + 1, + aTextWire1 + aMaterial.mName.toLowerCase() + ".02", + "2x " + name + aTextWire2, + 0.25F, + aMaterial, + aLoss, + 2L * aAmperage, + aVoltage, + false, + !aAutoInsulated).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt04, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 2, - aTextWire1 + aMaterial.mName.toLowerCase() + ".04", - "4x " + name + aTextWire2, - 0.375F, - aMaterial, - aLoss, - 4L * aAmperage, - aVoltage, - false, - !aAutoInsulated) - .getStackForm(1L)); + aStartID + 2, + aTextWire1 + aMaterial.mName.toLowerCase() + ".04", + "4x " + name + aTextWire2, + 0.375F, + aMaterial, + aLoss, + 4L * aAmperage, + aVoltage, + false, + !aAutoInsulated).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt08, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 3, - aTextWire1 + aMaterial.mName.toLowerCase() + ".08", - "8x " + name + aTextWire2, - 0.5F, - aMaterial, - aLoss, - 8L * aAmperage, - aVoltage, - false, - !aAutoInsulated) - .getStackForm(1L)); + aStartID + 3, + aTextWire1 + aMaterial.mName.toLowerCase() + ".08", + "8x " + name + aTextWire2, + 0.5F, + aMaterial, + aLoss, + 8L * aAmperage, + aVoltage, + false, + !aAutoInsulated).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt12, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 4, - aTextWire1 + aMaterial.mName.toLowerCase() + ".12", - "12x " + name + aTextWire2, - 0.625F, - aMaterial, - aLoss, - 12L * aAmperage, - aVoltage, - false, - !aAutoInsulated) - .getStackForm(1L)); + aStartID + 4, + aTextWire1 + aMaterial.mName.toLowerCase() + ".12", + "12x " + name + aTextWire2, + 0.625F, + aMaterial, + aLoss, + 12L * aAmperage, + aVoltage, + false, + !aAutoInsulated).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt16, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 5, - aTextWire1 + aMaterial.mName.toLowerCase() + ".16", - "16x " + name + aTextWire2, - 0.75F, - aMaterial, - aLoss, - 16L * aAmperage, - aVoltage, - false, - !aAutoInsulated) - .getStackForm(1L)); + aStartID + 5, + aTextWire1 + aMaterial.mName.toLowerCase() + ".16", + "16x " + name + aTextWire2, + 0.75F, + aMaterial, + aLoss, + 16L * aAmperage, + aVoltage, + false, + !aAutoInsulated).getStackForm(1L)); if (aInsulatable) { GT_OreDictUnificator.registerOre( OrePrefixes.cableGt01, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 6, - aTextCable1 + aMaterial.mName.toLowerCase() + ".01", - "1x " + name + aTextCable2, - 0.25F, - aMaterial, - aLossInsulated, - 1L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + aStartID + 6, + aTextCable1 + aMaterial.mName.toLowerCase() + ".01", + "1x " + name + aTextCable2, + 0.25F, + aMaterial, + aLossInsulated, + 1L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt02, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 7, - aTextCable1 + aMaterial.mName.toLowerCase() + ".02", - "2x " + name + aTextCable2, - 0.375F, - aMaterial, - aLossInsulated, - 2L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + aStartID + 7, + aTextCable1 + aMaterial.mName.toLowerCase() + ".02", + "2x " + name + aTextCable2, + 0.375F, + aMaterial, + aLossInsulated, + 2L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt04, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 8, - aTextCable1 + aMaterial.mName.toLowerCase() + ".04", - "4x " + name + aTextCable2, - 0.5F, - aMaterial, - aLossInsulated, - 4L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + aStartID + 8, + aTextCable1 + aMaterial.mName.toLowerCase() + ".04", + "4x " + name + aTextCable2, + 0.5F, + aMaterial, + aLossInsulated, + 4L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt08, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 9, - aTextCable1 + aMaterial.mName.toLowerCase() + ".08", - "8x " + name + aTextCable2, - 0.625F, - aMaterial, - aLossInsulated, - 8L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + aStartID + 9, + aTextCable1 + aMaterial.mName.toLowerCase() + ".08", + "8x " + name + aTextCable2, + 0.625F, + aMaterial, + aLossInsulated, + 8L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt12, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 10, - aTextCable1 + aMaterial.mName.toLowerCase() + ".12", - "12x " + name + aTextCable2, - 0.75F, - aMaterial, - aLossInsulated, - 12L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + aStartID + 10, + aTextCable1 + aMaterial.mName.toLowerCase() + ".12", + "12x " + name + aTextCable2, + 0.75F, + aMaterial, + aLossInsulated, + 12L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt16, aMaterial, new GT_MetaPipeEntity_Cable( - aStartID + 11, - aTextCable1 + aMaterial.mName.toLowerCase() + ".16", - "16x " + name + aTextCable2, - 0.875F, - aMaterial, - aLossInsulated, - 16L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + aStartID + 11, + aTextCable1 + aMaterial.mName.toLowerCase() + ".16", + "16x " + name + aTextCable2, + 0.875F, + aMaterial, + aLossInsulated, + 16L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); } } @@ -14680,85 +11053,79 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC baseInvSlots); } - private static void generateItemPipes( - Materials aMaterial, String name, String displayName, int startID, int baseInvSlots) { + private static void generateItemPipes(Materials aMaterial, String name, String displayName, int startID, + int baseInvSlots) { GT_OreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(aMaterial), new GT_MetaPipeEntity_Item( - startID, - "GT_Pipe_" + name, - displayName + " Item Pipe", - 0.50F, - aMaterial, - baseInvSlots, - 32768 / baseInvSlots, - false) - .getStackForm(1L)); + startID, + "GT_Pipe_" + name, + displayName + " Item Pipe", + 0.50F, + aMaterial, + baseInvSlots, + 32768 / baseInvSlots, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(aMaterial), new GT_MetaPipeEntity_Item( - startID + 1, - "GT_Pipe_" + name + "_Large", - "Large " + displayName + " Item Pipe", - 0.75F, - aMaterial, - baseInvSlots * 2, - 16384 / baseInvSlots, - false) - .getStackForm(1L)); + startID + 1, + "GT_Pipe_" + name + "_Large", + "Large " + displayName + " Item Pipe", + 0.75F, + aMaterial, + baseInvSlots * 2, + 16384 / baseInvSlots, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(aMaterial), new GT_MetaPipeEntity_Item( - startID + 2, - "GT_Pipe_" + name + "_Huge", - "Huge " + displayName + " Item Pipe", - 1.00F, - aMaterial, - baseInvSlots * 4, - 8192 / baseInvSlots, - false) - .getStackForm(1L)); + startID + 2, + "GT_Pipe_" + name + "_Huge", + "Huge " + displayName + " Item Pipe", + 1.00F, + aMaterial, + baseInvSlots * 4, + 8192 / baseInvSlots, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveMedium.get(aMaterial), new GT_MetaPipeEntity_Item( - startID + 3, - "GT_Pipe_Restrictive_" + name, - "Restrictive " + displayName + " Item Pipe", - 0.50F, - aMaterial, - baseInvSlots, - 3276800 / baseInvSlots, - true) - .getStackForm(1L)); + startID + 3, + "GT_Pipe_Restrictive_" + name, + "Restrictive " + displayName + " Item Pipe", + 0.50F, + aMaterial, + baseInvSlots, + 3276800 / baseInvSlots, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveLarge.get(aMaterial), new GT_MetaPipeEntity_Item( - startID + 4, - "GT_Pipe_Restrictive_" + name + "_Large", - "Large Restrictive " + displayName + " Item Pipe", - 0.75F, - aMaterial, - baseInvSlots * 2, - 1638400 / baseInvSlots, - true) - .getStackForm(1L)); + startID + 4, + "GT_Pipe_Restrictive_" + name + "_Large", + "Large Restrictive " + displayName + " Item Pipe", + 0.75F, + aMaterial, + baseInvSlots * 2, + 1638400 / baseInvSlots, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveHuge.get(aMaterial), new GT_MetaPipeEntity_Item( - startID + 5, - "GT_Pipe_Restrictive_" + name + "_Huge", - "Huge Restrictive " + displayName + " Item Pipe", - 0.875F, - aMaterial, - baseInvSlots * 4, - 819200 / baseInvSlots, - true) - .getStackForm(1L)); + startID + 5, + "GT_Pipe_Restrictive_" + name + "_Huge", + "Huge Restrictive " + displayName + " Item Pipe", + 0.875F, + aMaterial, + baseInvSlots * 4, + 819200 / baseInvSlots, + true).getStackForm(1L)); } @SuppressWarnings("SameParameterValue") - private static void generateFluidPipes( - Materials aMaterial, String name, int startID, int baseCapacity, int heatCapacity, boolean gasProof) { + private static void generateFluidPipes(Materials aMaterial, String name, int startID, int baseCapacity, + int heatCapacity, boolean gasProof) { generateFluidPipes( aMaterial, name, @@ -14769,115 +11136,96 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC gasProof); } - private static void generateFluidPipes( - Materials aMaterial, - String name, - String displayName, - int startID, - int baseCapacity, - int heatCapacity, - boolean gasProof) { + private static void generateFluidPipes(Materials aMaterial, String name, String displayName, int startID, + int baseCapacity, int heatCapacity, boolean gasProof) { GT_OreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(aMaterial), new GT_MetaPipeEntity_Fluid( - startID, - "GT_Pipe_" + name + "_Tiny", - "Tiny " + displayName + " Fluid Pipe", - 0.25F, - aMaterial, - baseCapacity / 6, - heatCapacity, - gasProof) - .getStackForm(1L)); + startID, + "GT_Pipe_" + name + "_Tiny", + "Tiny " + displayName + " Fluid Pipe", + 0.25F, + aMaterial, + baseCapacity / 6, + heatCapacity, + gasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(aMaterial), new GT_MetaPipeEntity_Fluid( - startID + 1, - "GT_Pipe_" + name + "_Small", - "Small " + displayName + " Fluid Pipe", - 0.375F, - aMaterial, - baseCapacity / 3, - heatCapacity, - gasProof) - .getStackForm(1L)); + startID + 1, + "GT_Pipe_" + name + "_Small", + "Small " + displayName + " Fluid Pipe", + 0.375F, + aMaterial, + baseCapacity / 3, + heatCapacity, + gasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(aMaterial), new GT_MetaPipeEntity_Fluid( - startID + 2, - "GT_Pipe_" + name, - displayName + " Fluid Pipe", - 0.5F, - aMaterial, - baseCapacity, - heatCapacity, - gasProof) - .getStackForm(1L)); + startID + 2, + "GT_Pipe_" + name, + displayName + " Fluid Pipe", + 0.5F, + aMaterial, + baseCapacity, + heatCapacity, + gasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(aMaterial), new GT_MetaPipeEntity_Fluid( - startID + 3, - "GT_Pipe_" + name + "_Large", - "Large " + displayName + " Fluid Pipe", - 0.75F, - aMaterial, - baseCapacity * 2, - heatCapacity, - gasProof) - .getStackForm(1L)); + startID + 3, + "GT_Pipe_" + name + "_Large", + "Large " + displayName + " Fluid Pipe", + 0.75F, + aMaterial, + baseCapacity * 2, + heatCapacity, + gasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(aMaterial), new GT_MetaPipeEntity_Fluid( - startID + 4, - "GT_Pipe_" + name + "_Huge", - "Huge " + displayName + " Fluid Pipe", - 0.875F, - aMaterial, - baseCapacity * 4, - heatCapacity, - gasProof) - .getStackForm(1L)); + startID + 4, + "GT_Pipe_" + name + "_Huge", + "Huge " + displayName + " Fluid Pipe", + 0.875F, + aMaterial, + baseCapacity * 4, + heatCapacity, + gasProof).getStackForm(1L)); } @SuppressWarnings("SameParameterValue") - private static void generateFluidMultiPipes( - Materials aMaterial, String name, int startID, int baseCapacity, int heatCapacity, boolean gasProof) { + private static void generateFluidMultiPipes(Materials aMaterial, String name, int startID, int baseCapacity, + int heatCapacity, boolean gasProof) { generateFluidMultiPipes(aMaterial, name, "%material", startID, baseCapacity, heatCapacity, gasProof); } - private static void generateFluidMultiPipes( - Materials aMaterial, - String name, - String displayName, - int startID, - int baseCapacity, - int heatCapacity, - boolean gasProof) { + private static void generateFluidMultiPipes(Materials aMaterial, String name, String displayName, int startID, + int baseCapacity, int heatCapacity, boolean gasProof) { GT_OreDictUnificator.registerOre( OrePrefixes.pipeQuadruple.get(aMaterial), new GT_MetaPipeEntity_Fluid( - startID, - "GT_Pipe_" + name + "_Quadruple", - "Quadruple " + displayName + " Fluid Pipe", - 1.0F, - aMaterial, - baseCapacity, - heatCapacity, - gasProof, - 4) - .getStackForm(1L)); + startID, + "GT_Pipe_" + name + "_Quadruple", + "Quadruple " + displayName + " Fluid Pipe", + 1.0F, + aMaterial, + baseCapacity, + heatCapacity, + gasProof, + 4).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeNonuple.get(aMaterial), new GT_MetaPipeEntity_Fluid( - startID + 1, - "GT_Pipe_" + name + "_Nonuple", - "Nonuple " + displayName + " Fluid Pipe", - 1.0F, - aMaterial, - baseCapacity / 3, - heatCapacity, - gasProof, - 9) - .getStackForm(1L)); + startID + 1, + "GT_Pipe_" + name + "_Nonuple", + "Nonuple " + displayName + " Fluid Pipe", + 1.0F, + aMaterial, + baseCapacity / 3, + heatCapacity, + gasProof, + 9).getStackForm(1L)); } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java index f7c6181d19..003d9b0310 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java @@ -2,37 +2,48 @@ package gregtech.loaders.preload; import static gregtech.GT_Mod.GT_FML_LOGGER; -import gregtech.api.multitileentity.MultiTileEntityBlock; -import gregtech.api.multitileentity.MultiTileEntityRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import gregtech.api.multitileentity.MultiTileEntityBlock; +import gregtech.api.multitileentity.MultiTileEntityRegistry; + public class GT_Loader_MultiTileEntities implements Runnable { + @Override public void run() { GT_FML_LOGGER.info("GT_Mod: Regisering MultiTileEntities"); final MultiTileEntityRegistry aRegistry = new MultiTileEntityRegistry("gt.multitileentity"); final MultiTileEntityBlock aMachine = MultiTileEntityBlock.getOrCreate( - "GregTech", "machine", Material.iron, Block.soundTypeMetal, "wrench", 0, 0, 15, true, true); + "GregTech", + "machine", + Material.iron, + Block.soundTypeMetal, + "wrench", + 0, + 0, + 15, + true, + true); // Disable for now - // aRegistry - // .create(1000, MultiBlock_Macerator.class) - // .name("Large Macerator") - // .category("Multiblock Controller") - // .setBlock(aMachine) - // .material(Materials.Iron) - // .texture("metalwall") - // .tankCapacity(128000L) - // .register(); + // aRegistry + // .create(1000, MultiBlock_Macerator.class) + // .name("Large Macerator") + // .category("Multiblock Controller") + // .setBlock(aMachine) + // .material(Materials.Iron) + // .texture("metalwall") + // .tankCapacity(128000L) + // .register(); // - // aRegistry - // .create(18000, MultiBlockPart.class) - // .name("Test Casing") - // .category("Multiblock Casing") - // .setBlock(aMachine) - // .material(Materials.Cobalt) - // .texture("metalwall") - // .register(); + // aRegistry + // .create(18000, MultiBlockPart.class) + // .name("Test Casing") + // .category("Multiblock Casing") + // .setBlock(aMachine) + // .material(Materials.Cobalt) + // .texture("metalwall") + // .register(); } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java index 0ed2ed63d7..273dcf1427 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java @@ -2,6 +2,10 @@ package gregtech.loaders.preload; import static gregtech.api.enums.GT_Values.MOD_ID_DC; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -11,11 +15,9 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class GT_Loader_OreDictionary implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Register OreDict Entries of Non-GT-Items."); @@ -25,7 +27,9 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Water, ItemList.Cell_Water.get(1L)); GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Water, GT_ModHandler.getIC2Item("waterCell", 1L)); GT_OreDictUnificator.set( - OrePrefixes.cell, Materials.Creosote, GT_ModHandler.getModItem("Railcraft", "fluid.creosote.cell", 1L)); + OrePrefixes.cell, + Materials.Creosote, + GT_ModHandler.getModItem("Railcraft", "fluid.creosote.cell", 1L)); GT_OreDictUnificator.set(OrePrefixes.cell, Materials.UUMatter, GT_ModHandler.getIC2Item("uuMatterCell", 1L)); GT_OreDictUnificator.set(OrePrefixes.cell, Materials.ConstructionFoam, GT_ModHandler.getIC2Item("CFCell", 1L)); @@ -40,10 +44,10 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.set(OrePrefixes.bottle, Materials.Empty, new ItemStack(Items.glass_bottle, 1, 0)); GT_OreDictUnificator.set(OrePrefixes.bottle, Materials.Water, new ItemStack(Items.potionitem, 1, 0)); - GT_OreDictUnificator.set( - OrePrefixes.plateAlloy, Materials.Iridium, GT_ModHandler.getIC2Item("iridiumPlate", 1L)); - GT_OreDictUnificator.set( - OrePrefixes.plateAlloy, Materials.Advanced, GT_ModHandler.getIC2Item("advancedAlloy", 1L)); + GT_OreDictUnificator + .set(OrePrefixes.plateAlloy, Materials.Iridium, GT_ModHandler.getIC2Item("iridiumPlate", 1L)); + GT_OreDictUnificator + .set(OrePrefixes.plateAlloy, Materials.Advanced, GT_ModHandler.getIC2Item("advancedAlloy", 1L)); GT_OreDictUnificator.set(OrePrefixes.plateAlloy, Materials.Carbon, GT_ModHandler.getIC2Item("carbonPlate", 1L)); GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Coal, new ItemStack(Blocks.coal_ore, 1)); @@ -95,31 +99,35 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(Blocks.ender_chest, 1)); } GT_OreDictUnificator.registerOre(OreDictNames.craftingAnvil, new ItemStack(Blocks.anvil, 1)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingAnvil, GT_ModHandler.getModItem("Railcraft", "anvil", 1L, 0)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingIndustrialDiamond, ItemList.IC2_Industrial_Diamond.get(1L)); GT_OreDictUnificator.registerOre( - OreDictNames.craftingAnvil, GT_ModHandler.getModItem("Railcraft", "anvil", 1L, 0)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingIndustrialDiamond, ItemList.IC2_Industrial_Diamond.get(1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.dust, Materials.Wood, GT_ModHandler.getModItem("ThermalExpansion", "sawdust", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.glass, Materials.Reinforced, GT_ModHandler.getIC2Item("reinforcedGlass", 1L)); + OrePrefixes.dust, + Materials.Wood, + GT_ModHandler.getModItem("ThermalExpansion", "sawdust", 1L)); + GT_OreDictUnificator + .registerOre(OrePrefixes.glass, Materials.Reinforced, GT_ModHandler.getIC2Item("reinforcedGlass", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.glass, Materials.Reinforced, GT_ModHandler.getModItem("ThermalExpansion", "glassHardened", 1L)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, GT_ModHandler.getModItem("Railcraft", "cube", 1L, 6)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Marble, GT_ModHandler.getModItem("Railcraft", "cube", 1L, 7)); GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, GT_ModHandler.getModItem("Railcraft", "cube", 1L, 6)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Marble, GT_ModHandler.getModItem("Railcraft", "cube", 1L, 7)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, GT_ModHandler.getModItem("Railcraft", "brick.abyssal", 1L, 32767)); + OrePrefixes.stone, + Materials.Basalt, + GT_ModHandler.getModItem("Railcraft", "brick.abyssal", 1L, 32767)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Marble, GT_ModHandler.getModItem("Railcraft", "brick.quarried", 1L, 32767)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Obsidian, new ItemStack(Blocks.obsidian, 1, 32767)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(Blocks.obsidian, 1, 32767)); GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Stone, new ItemStack(Blocks.stone, 1, 32767)); GT_OreDictUnificator.registerOre(OrePrefixes.stoneMossy, new ItemStack(Blocks.mossy_cobblestone, 1, 32767)); GT_OreDictUnificator.registerOre(OrePrefixes.stoneCobble, new ItemStack(Blocks.mossy_cobblestone, 1, 32767)); @@ -130,23 +138,26 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OrePrefixes.stoneCracked, new ItemStack(Blocks.stonebrick, 1, 2)); GT_OreDictUnificator.registerOre(OrePrefixes.stoneChiseled, new ItemStack(Blocks.stonebrick, 1, 3)); GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Sand, new ItemStack(Blocks.sandstone, 1, 32767)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Netherrack, new ItemStack(Blocks.netherrack, 1, 32767)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.NetherBrick, new ItemStack(Blocks.nether_brick, 1, 32767)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Endstone, new ItemStack(Blocks.end_stone, 1, 32767)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Glowstone, new ItemStack(Blocks.glowstone, 1, 32767)); + + GT_OreDictUnificator + .registerOre("paperResearchFragment", GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 9)); + GT_OreDictUnificator.registerOre( + "itemCertusQuartz", + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1)); GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Netherrack, new ItemStack(Blocks.netherrack, 1, 32767)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.NetherBrick, new ItemStack(Blocks.nether_brick, 1, 32767)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Endstone, new ItemStack(Blocks.end_stone, 1, 32767)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Glowstone, new ItemStack(Blocks.glowstone, 1, 32767)); - - GT_OreDictUnificator.registerOre( - "paperResearchFragment", GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 9)); - GT_OreDictUnificator.registerOre( - "itemCertusQuartz", GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1)); - GT_OreDictUnificator.registerOre( - "itemCertusQuartz", GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 10)); + "itemCertusQuartz", + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 10)); GT_OreDictUnificator.registerOre( - "itemNetherQuartz", GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 11)); + "itemNetherQuartz", + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 11)); GT_OreDictUnificator.registerOre( OreDictNames.craftingQuartz, GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1)); @@ -161,36 +172,46 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre("cropPotato", ItemList.Food_Raw_Potato.get(1L)); GT_OreDictUnificator.registerOre("calclavia:BATTERY", GT_ModHandler.getIC2Item("reBattery", 1L)); GT_OreDictUnificator.registerOre("calclavia:BATTERY", GT_ModHandler.getIC2Item("chargedReBattery", 1L, 32767)); + GT_OreDictUnificator + .registerOre(OrePrefixes.battery, Materials.Basic, GT_ModHandler.getIC2Item("reBattery", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.battery, Materials.Basic, GT_ModHandler.getIC2Item("reBattery", 1L)); + OrePrefixes.battery, + Materials.Basic, + GT_ModHandler.getIC2Item("chargedReBattery", 1L, 32767)); GT_OreDictUnificator.registerOre( - OrePrefixes.battery, Materials.Basic, GT_ModHandler.getIC2Item("chargedReBattery", 1L, 32767)); + OrePrefixes.battery, + Materials.Advanced, + GT_ModHandler.getIC2Item("advBattery", 1L, 32767)); GT_OreDictUnificator.registerOre( - OrePrefixes.battery, Materials.Advanced, GT_ModHandler.getIC2Item("advBattery", 1L, 32767)); + OrePrefixes.battery, + Materials.Elite, + GT_ModHandler.getIC2Item("energyCrystal", 1L, 32767)); GT_OreDictUnificator.registerOre( - OrePrefixes.battery, Materials.Elite, GT_ModHandler.getIC2Item("energyCrystal", 1L, 32767)); - GT_OreDictUnificator.registerOre( - OrePrefixes.battery, Materials.Master, GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 32767)); + OrePrefixes.battery, + Materials.Master, + GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 32767)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWireCopper, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWireGold, GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWireIron, GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingWireCopper, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingWireGold, GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingWireIron, GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L)); GT_OreDictUnificator.registerOre( OreDictNames.craftingWireTin, GT_ModHandler.getIC2Item( - "insulatedTinCableItem", 1L, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L))); + "insulatedTinCableItem", + 1L, + GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L))); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.redstone_torch, 1, 32767)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.unlit_redstone_torch, 1, 32767)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.redstone_torch, 1, 32767)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.unlit_redstone_torch, 1, 32767)); GT_OreDictUnificator.registerOre(OreDictNames.craftingWorkBench, new ItemStack(Blocks.crafting_table, 1)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWorkBench, new ItemStack(GregTech_API.sBlockMachines, 1, 16)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingWorkBench, new ItemStack(GregTech_API.sBlockMachines, 1, 16)); GT_OreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.piston, 1, 32767)); GT_OreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.sticky_piston, 1, 32767)); @@ -205,47 +226,49 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingFurnace, new ItemStack(Blocks.lit_furnace, 1, 32767)); GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, GT_ModHandler.getIC2Item("pump", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingElectromagnet, GT_ModHandler.getIC2Item("magnetizer", 1L)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingElectromagnet, GT_ModHandler.getIC2Item("magnetizer", 1L)); GT_OreDictUnificator.registerOre(OreDictNames.craftingTeleporter, GT_ModHandler.getIC2Item("teleporter", 1L)); GT_OreDictUnificator.registerOre(OreDictNames.craftingMacerator, GT_ModHandler.getIC2Item("macerator", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingMacerator, new ItemStack(GregTech_API.sBlockMachines, 1, 50)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingMacerator, new ItemStack(GregTech_API.sBlockMachines, 1, 50)); GT_OreDictUnificator.registerOre(OreDictNames.craftingExtractor, GT_ModHandler.getIC2Item("extractor", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingExtractor, new ItemStack(GregTech_API.sBlockMachines, 1, 51)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingExtractor, new ItemStack(GregTech_API.sBlockMachines, 1, 51)); GT_OreDictUnificator.registerOre(OreDictNames.craftingCompressor, GT_ModHandler.getIC2Item("compressor", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingCompressor, new ItemStack(GregTech_API.sBlockMachines, 1, 52)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingCompressor, new ItemStack(GregTech_API.sBlockMachines, 1, 52)); GT_OreDictUnificator.registerOre(OreDictNames.craftingRecycler, GT_ModHandler.getIC2Item("recycler", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingRecycler, new ItemStack(GregTech_API.sBlockMachines, 1, 53)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingRecycler, new ItemStack(GregTech_API.sBlockMachines, 1, 53)); GT_OreDictUnificator.registerOre(OreDictNames.craftingIronFurnace, GT_ModHandler.getIC2Item("ironFurnace", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingCentrifuge, new ItemStack(GregTech_API.sBlockMachines, 1, 62)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingCentrifuge, new ItemStack(GregTech_API.sBlockMachines, 1, 62)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingInductionFurnace, GT_ModHandler.getIC2Item("inductionFurnace", 1L)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingInductionFurnace, GT_ModHandler.getIC2Item("inductionFurnace", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingElectricFurnace, GT_ModHandler.getIC2Item("electroFurnace", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingElectricFurnace, new ItemStack(GregTech_API.sBlockMachines, 1, 54)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingElectricFurnace, GT_ModHandler.getIC2Item("electroFurnace", 1L)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingElectricFurnace, new ItemStack(GregTech_API.sBlockMachines, 1, 54)); GT_OreDictUnificator.registerOre(OreDictNames.craftingGenerator, GT_ModHandler.getIC2Item("generator", 1L)); GT_OreDictUnificator.registerOre( - OreDictNames.craftingGeothermalGenerator, GT_ModHandler.getIC2Item("geothermalGenerator", 1L)); + OreDictNames.craftingGeothermalGenerator, + GT_ModHandler.getIC2Item("geothermalGenerator", 1L)); GT_OreDictUnificator.registerOre(OreDictNames.craftingFeather, new ItemStack(Items.feather, 1, 32767)); GT_OreDictUnificator.registerOre( - OreDictNames.craftingFeather, GT_ModHandler.getModItem("TwilightForest", "item.tfFeather", 1L, 32767)); + OreDictNames.craftingFeather, + GT_ModHandler.getModItem("TwilightForest", "item.tfFeather", 1L, 32767)); GT_OreDictUnificator.registerOre("itemWheat", new ItemStack(Items.wheat, 1, 32767)); GT_OreDictUnificator.registerOre("paperEmpty", new ItemStack(Items.paper, 1, 32767)); @@ -260,25 +283,39 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.written_book, 1, 32767)); GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.enchanted_book, 1, 32767)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Basic, GT_ModHandler.getIC2Item("electronicCircuit", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Advanced, GT_ModHandler.getIC2Item("advancedCircuit", 1L)); + GT_OreDictUnificator + .registerOre(OrePrefixes.circuit, Materials.Basic, GT_ModHandler.getIC2Item("electronicCircuit", 1L)); + GT_OreDictUnificator + .registerOre(OrePrefixes.circuit, Materials.Advanced, GT_ModHandler.getIC2Item("advancedCircuit", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, Materials.Copper, GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 0)); + OrePrefixes.itemCasing, + Materials.Copper, + GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, Materials.Tin, GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 1)); + OrePrefixes.itemCasing, + Materials.Tin, + GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 1)); GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, Materials.Bronze, GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 2)); + OrePrefixes.itemCasing, + Materials.Bronze, + GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 2)); GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, Materials.Gold, GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 3)); + OrePrefixes.itemCasing, + Materials.Gold, + GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 3)); GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, Materials.Iron, GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 4)); + OrePrefixes.itemCasing, + Materials.Iron, + GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 4)); GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, Materials.Steel, GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 5)); + OrePrefixes.itemCasing, + Materials.Steel, + GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 5)); GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, Materials.Lead, GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 6)); + OrePrefixes.itemCasing, + Materials.Lead, + GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 6)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, @@ -319,44 +356,70 @@ public class GT_Loader_OreDictionary implements Runnable { // Fake Circuits GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Primitive, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitULV", 1L)); + OrePrefixes.circuit, + Materials.Primitive, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitULV", 1L)); // GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Basic, GT_ModHandler.getModItem(MOD_ID_DC, // "item.CircuitLV", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Good, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitMV", 1L)); + OrePrefixes.circuit, + Materials.Good, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitMV", 1L)); // GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Advanced, GT_ModHandler.getModItem(MOD_ID_DC, // "item.CircuitHV", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Data, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitEV", 1L)); + OrePrefixes.circuit, + Materials.Data, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitEV", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Elite, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitIV", 1L)); + OrePrefixes.circuit, + Materials.Elite, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitIV", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Master, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitLuV", 1L)); + OrePrefixes.circuit, + Materials.Master, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitLuV", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Ultimate, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitZPM", 1L)); + OrePrefixes.circuit, + Materials.Ultimate, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitZPM", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Superconductor, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUV", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Infinite, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUHV", 1L)); + OrePrefixes.circuit, + Materials.Infinite, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUHV", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Bio, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUEV", 1L)); + OrePrefixes.circuit, + Materials.Bio, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUEV", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Optical, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUIV", 1L)); + OrePrefixes.circuit, + Materials.Optical, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUIV", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Exotic, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUMV", 1L)); + OrePrefixes.circuit, + Materials.Exotic, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUMV", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, Materials.Cosmic, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUXV", 1L)); + OrePrefixes.circuit, + Materials.Cosmic, + GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUXV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Transcendent, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitMAX", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.block, MaterialsBotania.Manasteel, GT_ModHandler.getModItem("Botania", "storage", 1L)); + OrePrefixes.block, + MaterialsBotania.Manasteel, + GT_ModHandler.getModItem("Botania", "storage", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.block, MaterialsBotania.Terrasteel, GT_ModHandler.getModItem("Botania", "storage", 1L, 1)); + OrePrefixes.block, + MaterialsBotania.Terrasteel, + GT_ModHandler.getModItem("Botania", "storage", 1L, 1)); GT_OreDictUnificator.registerOre( OrePrefixes.ingot, MaterialsBotania.ElvenElementium, @@ -370,21 +433,29 @@ public class GT_Loader_OreDictionary implements Runnable { MaterialsBotania.ElvenElementium, GT_ModHandler.getModItem("Botania", "storage", 1L, 2)); GT_OreDictUnificator.registerOre( - OrePrefixes.block, MaterialsBotania.Livingrock, GT_ModHandler.getModItem("Botania", "livingrock", 1L)); + OrePrefixes.block, + MaterialsBotania.Livingrock, + GT_ModHandler.getModItem("Botania", "livingrock", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.ingot, MaterialsBotania.GaiaSpirit, GT_ModHandler.getModItem("Botania", "manaResource", 1L, 14)); GT_OreDictUnificator.registerOre( - OrePrefixes.block, MaterialsBotania.Livingwood, GT_ModHandler.getModItem("Botania", "livingwood", 1L)); + OrePrefixes.block, + MaterialsBotania.Livingwood, + GT_ModHandler.getModItem("Botania", "livingwood", 1L)); GT_OreDictUnificator.registerOre( - OrePrefixes.block, MaterialsBotania.Dreamwood, GT_ModHandler.getModItem("Botania", "dreamwood", 1L)); + OrePrefixes.block, + MaterialsBotania.Dreamwood, + GT_ModHandler.getModItem("Botania", "dreamwood", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.gem, MaterialsBotania.ManaDiamond, GT_ModHandler.getModItem("Botania", "manaResource", 1L, 2)); GT_OreDictUnificator.registerOre( - OrePrefixes.block, MaterialsBotania.ManaDiamond, GT_ModHandler.getModItem("Botania", "storage", 1L, 3)); + OrePrefixes.block, + MaterialsBotania.ManaDiamond, + GT_ModHandler.getModItem("Botania", "storage", 1L, 3)); GT_OreDictUnificator.registerOre( OrePrefixes.gem, MaterialsBotania.BotaniaDragonstone, diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java index e4351f16ab..4d7f4dabdd 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java @@ -4,6 +4,7 @@ import gregtech.api.util.GT_Log; import gregtech.loaders.oreprocessing.*; public class GT_Loader_OreProcessing implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Register Ore processing."); diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index 4b9b5d1493..53c5fc833c 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -4,6 +4,24 @@ import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.enums.GT_Values.MOD_ID_AE; import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.List; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import net.minecraft.init.Blocks; +import net.minecraftforge.common.config.Configuration; + +import org.apache.commons.lang3.StringUtils; + import cpw.mods.fml.common.LoadController; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; @@ -21,29 +39,15 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineBase; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Cleanroom; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.List; -import java.util.Objects; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import net.minecraft.init.Blocks; -import net.minecraftforge.common.config.Configuration; -import org.apache.commons.lang3.StringUtils; public class GT_PreLoad { + public static void sortToTheEnd() { if (GT_Mod.gregtechproxy.mSortToTheEnd) { try { GT_FML_LOGGER.info("GT_Mod: Sorting GregTech to the end of the Mod List for further processing."); - LoadController tLoadController = - (LoadController) GT_Utility.getFieldContent(Loader.instance(), "modController", true, true); + LoadController tLoadController = (LoadController) GT_Utility + .getFieldContent(Loader.instance(), "modController", true, true); assert tLoadController != null; List<ModContainer> tModList = tLoadController.getActiveModList(); List<ModContainer> tNewModsList = new ArrayList<>(); @@ -72,18 +76,16 @@ public class GT_PreLoad { GT_FML_LOGGER.info("GT_Mod: Generating Lang-File"); GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); GT_LanguageManager.sEnglishFile.load(); - if (GT_LanguageManager.sEnglishFile - .get("EnableLangFile", "UseThisFileAsLanguageFile", false) + if (GT_LanguageManager.sEnglishFile.get("EnableLangFile", "UseThisFileAsLanguageFile", false) .getBoolean(false)) { - GT_LanguageManager.sLanguage = GT_LanguageManager.sEnglishFile - .get("EnableLangFile", "Language", "en_US") + GT_LanguageManager.sLanguage = GT_LanguageManager.sEnglishFile.get("EnableLangFile", "Language", "en_US") .getString(); } - Materials.getMaterialsMap().values().parallelStream() - .filter(Objects::nonNull) - .forEach(aMaterial -> aMaterial.mLocalizedName = GT_LanguageManager.addStringLocalization( - "Material." + aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName)); + Materials.getMaterialsMap().values().parallelStream().filter(Objects::nonNull).forEach( + aMaterial -> aMaterial.mLocalizedName = GT_LanguageManager.addStringLocalization( + "Material." + aMaterial.mName.toLowerCase(), + aMaterial.mDefaultLocalName)); } public static Configuration getConfiguration(File configDir) { @@ -94,25 +96,25 @@ public class GT_PreLoad { GT_Config.sConfigFileIDs = new Configuration(tFile); GT_Config.sConfigFileIDs.load(); GT_Config.sConfigFileIDs.save(); - GregTech_API.sRecipeFile = - new GT_Config(new Configuration(new File(new File(configDir, "GregTech"), "Recipes.cfg"))); - GregTech_API.sMachineFile = - new GT_Config(new Configuration(new File(new File(configDir, "GregTech"), "MachineStats.cfg"))); - GregTech_API.sWorldgenFile = - new GT_Config(new Configuration(new File(new File(configDir, "GregTech"), "WorldGeneration.cfg"))); - GregTech_API.sMaterialProperties = - new GT_Config(new Configuration(new File(new File(configDir, "GregTech"), "MaterialProperties.cfg"))); - GregTech_API.sMaterialComponents = - new GT_Config(new Configuration(new File(new File(configDir, "GregTech"), "MaterialComponents.cfg"))); - GregTech_API.sUnification = - new GT_Config(new Configuration(new File(new File(configDir, "GregTech"), "Unification.cfg"))); - GregTech_API.sSpecialFile = - new GT_Config(new Configuration(new File(new File(configDir, "GregTech"), "Other.cfg"))); - GregTech_API.sOPStuff = - new GT_Config(new Configuration(new File(new File(configDir, "GregTech"), "OverpoweredStuff.cfg"))); - - GregTech_API.sClientDataFile = - new GT_Config(new Configuration(new File(new File(configDir, "GregTech"), "Client.cfg"))); + GregTech_API.sRecipeFile = new GT_Config( + new Configuration(new File(new File(configDir, "GregTech"), "Recipes.cfg"))); + GregTech_API.sMachineFile = new GT_Config( + new Configuration(new File(new File(configDir, "GregTech"), "MachineStats.cfg"))); + GregTech_API.sWorldgenFile = new GT_Config( + new Configuration(new File(new File(configDir, "GregTech"), "WorldGeneration.cfg"))); + GregTech_API.sMaterialProperties = new GT_Config( + new Configuration(new File(new File(configDir, "GregTech"), "MaterialProperties.cfg"))); + GregTech_API.sMaterialComponents = new GT_Config( + new Configuration(new File(new File(configDir, "GregTech"), "MaterialComponents.cfg"))); + GregTech_API.sUnification = new GT_Config( + new Configuration(new File(new File(configDir, "GregTech"), "Unification.cfg"))); + GregTech_API.sSpecialFile = new GT_Config( + new Configuration(new File(new File(configDir, "GregTech"), "Other.cfg"))); + GregTech_API.sOPStuff = new GT_Config( + new Configuration(new File(new File(configDir, "GregTech"), "OverpoweredStuff.cfg"))); + + GregTech_API.sClientDataFile = new GT_Config( + new Configuration(new File(new File(configDir, "GregTech"), "Client.cfg"))); return tMainConfig; } @@ -130,26 +132,22 @@ public class GT_PreLoad { if (!GT_Log.mLogFile.exists()) { try { final boolean ignored = GT_Log.mLogFile.createNewFile(); - } catch (Throwable ignored) { - } + } catch (Throwable ignored) {} } try { GT_Log.out = GT_Log.err = new PrintStream(GT_Log.mLogFile); - } catch (FileNotFoundException ignored) { - } + } catch (FileNotFoundException ignored) {} if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingOreDict", false).getBoolean(false)) { GT_Log.mOreDictLogFile = new File(parentFile, "logs/OreDict.log"); if (!GT_Log.mOreDictLogFile.exists()) { try { final boolean ignored = GT_Log.mOreDictLogFile.createNewFile(); - } catch (Throwable ignored) { - } + } catch (Throwable ignored) {} } try { GT_Log.ore = new PrintStream(GT_Log.mOreDictLogFile); - } catch (Throwable ignored) { - } + } catch (Throwable ignored) {} try { List<String> tList = ((GT_Log.LogBuffer) GT_Log.ore).mBufferedOreDictLog; GT_Log.ore.println("******************************************************************************"); @@ -159,21 +157,18 @@ public class GT_PreLoad { GT_Log.ore.println("* issue at https://github.com/Blood-Asp/GT5-Unofficial. *"); GT_Log.ore.println("******************************************************************************"); tList.forEach(GT_Log.ore::println); - } catch (Throwable ignored) { - } + } catch (Throwable ignored) {} } if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingExplosions", true).getBoolean(true)) { GT_Log.mExplosionLog = new File(parentFile, "logs/Explosion.log"); if (!GT_Log.mExplosionLog.exists()) { try { final boolean ignored = GT_Log.mExplosionLog.createNewFile(); - } catch (Throwable ignored) { - } + } catch (Throwable ignored) {} } try { GT_Log.exp = new PrintStream(GT_Log.mExplosionLog); - } catch (Throwable ignored) { - } + } catch (Throwable ignored) {} } if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingPlayerActivity", true).getBoolean(true)) { @@ -181,13 +176,11 @@ public class GT_PreLoad { if (!GT_Log.mPlayerActivityLogFile.exists()) { try { final boolean ignored = GT_Log.mPlayerActivityLogFile.createNewFile(); - } catch (Throwable ignored) { - } + } catch (Throwable ignored) {} } try { GT_Log.pal = new PrintStream(GT_Log.mPlayerActivityLogFile); - } catch (Throwable ignored) { - } + } catch (Throwable ignored) {} } } @@ -238,86 +231,22 @@ public class GT_PreLoad { int material = meta % 1000; String tag = ""; String[] tags = new String[] {}; - if (mIt == 1) - tags = new String[] { - "dustTiny", - "dustSmall", - "dust", - "dustImpure", - "dustPure", - "crushed", - "crushedPurified", - "crushedCentrifuged", - "gem", - "nugget", - null, - "ingot", - "ingotHot", - "ingotDouble", - "ingotTriple", - "ingotQuadruple", - "ingotQuintuple", - "plate", - "plateDouble", - "plateTriple", - "plateQuadruple", - "plateQuintuple", - "plateDense", - "stick", - "lens", - "round", - "bolt", - "screw", - "ring", - "foil", - "cell", - "cellPlasma", - "cellMolten" - }; - if (mIt == 2) - tags = new String[] { - "toolHeadSword", - "toolHeadPickaxe", - "toolHeadShovel", - "toolHeadAxe", - "toolHeadHoe", - "toolHeadHammer", - "toolHeadFile", - "toolHeadSaw", - "toolHeadDrill", - "toolHeadChainsaw", - "toolHeadWrench", - "toolHeadUniversalSpade", - "toolHeadSense", - "toolHeadPlow", - "toolHeadArrow", - "toolHeadBuzzSaw", - "turbineBlade", - null, - null, - "wireFine", - "gearGtSmall", - "rotor", - "stickLong", - "springSmall", - "spring", - "arrowGtWood", - "arrowGtPlastic", - "gemChipped", - "gemFlawed", - "gemFlawless", - "gemExquisite", - "gearGt" - }; - if (mIt == 3) - tags = new String[] { - "crateGtDust", - "crateGtIngot", - "crateGtGem", - "crateGtPlate", - "itemCasing", - "nanite" - }; + if (mIt == 1) tags = new String[] { "dustTiny", "dustSmall", "dust", "dustImpure", + "dustPure", "crushed", "crushedPurified", "crushedCentrifuged", "gem", "nugget", + null, "ingot", "ingotHot", "ingotDouble", "ingotTriple", "ingotQuadruple", + "ingotQuintuple", "plate", "plateDouble", "plateTriple", "plateQuadruple", + "plateQuintuple", "plateDense", "stick", "lens", "round", "bolt", "screw", + "ring", "foil", "cell", "cellPlasma", "cellMolten" }; + if (mIt == 2) tags = new String[] { "toolHeadSword", "toolHeadPickaxe", + "toolHeadShovel", "toolHeadAxe", "toolHeadHoe", "toolHeadHammer", + "toolHeadFile", "toolHeadSaw", "toolHeadDrill", "toolHeadChainsaw", + "toolHeadWrench", "toolHeadUniversalSpade", "toolHeadSense", "toolHeadPlow", + "toolHeadArrow", "toolHeadBuzzSaw", "turbineBlade", null, null, "wireFine", + "gearGtSmall", "rotor", "stickLong", "springSmall", "spring", "arrowGtWood", + "arrowGtPlastic", "gemChipped", "gemFlawed", "gemFlawless", "gemExquisite", + "gearGt" }; + if (mIt == 3) tags = new String[] { "crateGtDust", "crateGtIngot", "crateGtGem", + "crateGtPlate", "itemCasing", "nanite" }; if (tags.length > prefix) tag = tags[prefix]; if (GregTech_API.sGeneratedMaterials[material] != null) { tag += GregTech_API.sGeneratedMaterials[material].mName; @@ -332,75 +261,16 @@ public class GT_PreLoad { } } - final String[] preS = new String[] { - "dustTiny", - "dustSmall", - "dust", - "dustImpure", - "dustPure", - "crushed", - "crushedPurified", - "crushedCentrifuged", - "gem", - "nugget", - "ingot", - "ingotHot", - "ingotDouble", - "ingotTriple", - "ingotQuadruple", - "ingotQuintuple", - "plate", - "plateDouble", - "plateTriple", - "plateQuadruple", - "plateQuintuple", - "plateDense", - "stick", - "lens", - "round", - "bolt", - "screw", - "ring", - "foil", - "cell", - "cellPlasma", - "toolHeadSword", - "toolHeadPickaxe", - "toolHeadShovel", - "toolHeadAxe", - "toolHeadHoe", - "toolHeadHammer", - "toolHeadFile", - "toolHeadSaw", - "toolHeadDrill", - "toolHeadChainsaw", - "toolHeadWrench", - "toolHeadUniversalSpade", - "toolHeadSense", - "toolHeadPlow", - "toolHeadArrow", - "toolHeadBuzzSaw", - "turbineBlade", - "wireFine", - "gearGtSmall", - "rotor", - "stickLong", - "springSmall", - "spring", - "arrowGtWood", - "arrowGtPlastic", - "gemChipped", - "gemFlawed", - "gemFlawless", - "gemExquisite", - "gearGt", - "crateGtDust", - "crateGtIngot", - "crateGtGem", - "crateGtPlate", - "nanite", - "cellMolten" - }; + final String[] preS = new String[] { "dustTiny", "dustSmall", "dust", "dustImpure", "dustPure", "crushed", + "crushedPurified", "crushedCentrifuged", "gem", "nugget", "ingot", "ingotHot", "ingotDouble", + "ingotTriple", "ingotQuadruple", "ingotQuintuple", "plate", "plateDouble", "plateTriple", + "plateQuadruple", "plateQuintuple", "plateDense", "stick", "lens", "round", "bolt", "screw", "ring", + "foil", "cell", "cellPlasma", "toolHeadSword", "toolHeadPickaxe", "toolHeadShovel", "toolHeadAxe", + "toolHeadHoe", "toolHeadHammer", "toolHeadFile", "toolHeadSaw", "toolHeadDrill", "toolHeadChainsaw", + "toolHeadWrench", "toolHeadUniversalSpade", "toolHeadSense", "toolHeadPlow", "toolHeadArrow", + "toolHeadBuzzSaw", "turbineBlade", "wireFine", "gearGtSmall", "rotor", "stickLong", "springSmall", + "spring", "arrowGtWood", "arrowGtPlastic", "gemChipped", "gemFlawed", "gemFlawless", "gemExquisite", + "gearGt", "crateGtDust", "crateGtIngot", "crateGtGem", "crateGtPlate", "nanite", "cellMolten" }; List<String> mMTTags = new ArrayList<>(); oreTags.stream().filter(test -> StringUtils.startsWithAny(test, preS)).forEach(test -> { @@ -459,12 +329,12 @@ public class GT_PreLoad { try { Objects.requireNonNull(GT_Utility.getField("ic2.core.item.ItemScrapbox$Drop", "topChance", true, true)) .set(null, 0); - ((List<?>) Objects.requireNonNull(GT_Utility.getFieldContent( + ((List<?>) Objects.requireNonNull( + GT_Utility.getFieldContent( GT_Utility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true), "drops", true, - true))) - .clear(); + true))).clear(); } catch (Throwable e) { if (GT_Values.D1) { e.printStackTrace(GT_Log.err); @@ -477,186 +347,133 @@ public class GT_PreLoad { public static void loadConfig(Configuration tMainConfig) { GT_Values.D1 = tMainConfig.get(GT_Mod.aTextGeneral, "Debug", false).getBoolean(false); GT_Values.D2 = tMainConfig.get(GT_Mod.aTextGeneral, "Debug2", false).getBoolean(false); - GT_Values.updateFluidDisplayItems = tMainConfig - .get(GT_Mod.aTextGeneral, "update fluid display items", true) + GT_Values.updateFluidDisplayItems = tMainConfig.get(GT_Mod.aTextGeneral, "update fluid display items", true) .getBoolean(true); - GT_Values.allow_broken_recipemap = tMainConfig - .get(GT_Mod.aTextGeneral, "debug allow broken recipemap", false) + GT_Values.allow_broken_recipemap = tMainConfig.get(GT_Mod.aTextGeneral, "debug allow broken recipemap", false) .getBoolean(false); - GT_Values.debugCleanroom = - tMainConfig.get(GT_Mod.aTextGeneral, "debugCleanroom", false).getBoolean(false); - GT_Values.debugDriller = - tMainConfig.get(GT_Mod.aTextGeneral, "debugDriller", false).getBoolean(false); - GT_Values.debugWorldGen = - tMainConfig.get(GT_Mod.aTextGeneral, "debugWorldGen", false).getBoolean(false); - GT_Values.debugOrevein = - tMainConfig.get(GT_Mod.aTextGeneral, "debugOrevein", false).getBoolean(false); - GT_Values.debugSmallOres = - tMainConfig.get(GT_Mod.aTextGeneral, "debugSmallOres", false).getBoolean(false); - GT_Values.debugStones = - tMainConfig.get(GT_Mod.aTextGeneral, "debugStones", false).getBoolean(false); - GT_Values.debugBlockMiner = - tMainConfig.get(GT_Mod.aTextGeneral, "debugBlockMiner", false).getBoolean(false); - GT_Values.debugBlockPump = - tMainConfig.get(GT_Mod.aTextGeneral, "debugBlockPump", false).getBoolean(false); - GT_Values.debugEntityCramming = tMainConfig - .get(GT_Mod.aTextGeneral, "debugEntityCramming", false) + GT_Values.debugCleanroom = tMainConfig.get(GT_Mod.aTextGeneral, "debugCleanroom", false).getBoolean(false); + GT_Values.debugDriller = tMainConfig.get(GT_Mod.aTextGeneral, "debugDriller", false).getBoolean(false); + GT_Values.debugWorldGen = tMainConfig.get(GT_Mod.aTextGeneral, "debugWorldGen", false).getBoolean(false); + GT_Values.debugOrevein = tMainConfig.get(GT_Mod.aTextGeneral, "debugOrevein", false).getBoolean(false); + GT_Values.debugSmallOres = tMainConfig.get(GT_Mod.aTextGeneral, "debugSmallOres", false).getBoolean(false); + GT_Values.debugStones = tMainConfig.get(GT_Mod.aTextGeneral, "debugStones", false).getBoolean(false); + GT_Values.debugBlockMiner = tMainConfig.get(GT_Mod.aTextGeneral, "debugBlockMiner", false).getBoolean(false); + GT_Values.debugBlockPump = tMainConfig.get(GT_Mod.aTextGeneral, "debugBlockPump", false).getBoolean(false); + GT_Values.debugEntityCramming = tMainConfig.get(GT_Mod.aTextGeneral, "debugEntityCramming", false) .getBoolean(false); - GT_Values.debugWorldData = - tMainConfig.get(GT_Mod.aTextGeneral, "debugWorldData", false).getBoolean(false); - GT_Values.oreveinPercentage = tMainConfig - .get(GT_Mod.aTextGeneral, "oreveinPercentage_100", 100) - .getInt(100); - GT_Values.oreveinAttempts = - tMainConfig.get(GT_Mod.aTextGeneral, "oreveinAttempts_64", 64).getInt(64); - GT_Values.oreveinMaxPlacementAttempts = tMainConfig - .get(GT_Mod.aTextGeneral, "oreveinMaxPlacementAttempts_8", 8) + GT_Values.debugWorldData = tMainConfig.get(GT_Mod.aTextGeneral, "debugWorldData", false).getBoolean(false); + GT_Values.oreveinPercentage = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPercentage_100", 100).getInt(100); + GT_Values.oreveinAttempts = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinAttempts_64", 64).getInt(64); + GT_Values.oreveinMaxPlacementAttempts = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinMaxPlacementAttempts_8", 8) .getInt(8); - GT_Values.oreveinPlacerOres = - tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPlacerOres", true).getBoolean(true); - GT_Values.oreveinPlacerOresMultiplier = tMainConfig - .get(GT_Mod.aTextGeneral, "oreveinPlacerOresMultiplier", 2) + GT_Values.oreveinPlacerOres = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPlacerOres", true).getBoolean(true); + GT_Values.oreveinPlacerOresMultiplier = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPlacerOresMultiplier", 2) .getInt(2); // GT_Values.oreveinMaxSize = tMainConfig.get(aTextGeneral, "oreveinMaxSize_64",64).getInt(64); - GT_Values.ticksBetweenSounds = - tMainConfig.get("machines", "TicksBetweenSounds", 30).getInt(30); - GT_Values.cleanroomGlass = (float) tMainConfig - .get("machines", "ReinforcedGlassPercentageForCleanroom", 5D) + GT_Values.ticksBetweenSounds = tMainConfig.get("machines", "TicksBetweenSounds", 30).getInt(30); + GT_Values.cleanroomGlass = (float) tMainConfig.get("machines", "ReinforcedGlassPercentageForCleanroom", 5D) .getDouble(5D); - GT_Values.enableChunkloaders = - tMainConfig.get("machines", "enableChunkloaders", true).getBoolean(true); - GT_Values.alwaysReloadChunkloaders = - tMainConfig.get("machines", "alwaysReloadChunkloaders", false).getBoolean(false); - GT_Values.debugChunkloaders = - tMainConfig.get("machines", "debugChunkloaders", false).getBoolean(false); - GT_Values.disableDigitalChestsExternalAccess = tMainConfig - .get("machines", "disableDigitalChestsExternalAccess", false) + GT_Values.enableChunkloaders = tMainConfig.get("machines", "enableChunkloaders", true).getBoolean(true); + GT_Values.alwaysReloadChunkloaders = tMainConfig.get("machines", "alwaysReloadChunkloaders", false) .getBoolean(false); + GT_Values.debugChunkloaders = tMainConfig.get("machines", "debugChunkloaders", false).getBoolean(false); + GT_Values.disableDigitalChestsExternalAccess = tMainConfig + .get("machines", "disableDigitalChestsExternalAccess", false).getBoolean(false); GregTech_API.TICKS_FOR_LAG_AVERAGING = tMainConfig - .get(GT_Mod.aTextGeneral, "TicksForLagAveragingWithScanner", 25) - .getInt(25); + .get(GT_Mod.aTextGeneral, "TicksForLagAveragingWithScanner", 25).getInt(25); GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = tMainConfig - .get(GT_Mod.aTextGeneral, "MillisecondsPassedInGTTileEntityUntilLagWarning", 100) - .getInt(100); + .get(GT_Mod.aTextGeneral, "MillisecondsPassedInGTTileEntityUntilLagWarning", 100).getInt(100); if (tMainConfig.get(GT_Mod.aTextGeneral, "disable_STDOUT", false).getBoolean(false)) { GT_FML_LOGGER.info("Disableing Console Messages."); GT_FML_LOGGER.exit(); System.out.close(); System.err.close(); } - GregTech_API.sMachineExplosions = - tMainConfig.get("machines", "machines_explosion_damage", true).getBoolean(false); - GregTech_API.sMachineFlammable = - tMainConfig.get("machines", "machines_flammable", true).getBoolean(false); - GregTech_API.sMachineNonWrenchExplosions = - tMainConfig.get("machines", "explosions_on_nonwrenching", true).getBoolean(false); - GregTech_API.sMachineWireFire = - tMainConfig.get("machines", "wirefire_on_explosion", true).getBoolean(false); - GregTech_API.sMachineFireExplosions = - tMainConfig.get("machines", "fire_causes_explosions", true).getBoolean(false); - GregTech_API.sMachineRainExplosions = - tMainConfig.get("machines", "rain_causes_explosions", true).getBoolean(false); - GregTech_API.sMachineThunderExplosions = - tMainConfig.get("machines", "lightning_causes_explosions", true).getBoolean(false); - GregTech_API.sConstantEnergy = - tMainConfig.get("machines", "constant_need_of_energy", true).getBoolean(false); - GregTech_API.sColoredGUI = - tMainConfig.get("machines", "colored_guis_when_painted", true).getBoolean(false); - GregTech_API.sMachineMetalGUI = tMainConfig - .get("machines", "guis_in_consistent_machine_metal_color", false) + GregTech_API.sMachineExplosions = tMainConfig.get("machines", "machines_explosion_damage", true) + .getBoolean(false); + GregTech_API.sMachineFlammable = tMainConfig.get("machines", "machines_flammable", true).getBoolean(false); + GregTech_API.sMachineNonWrenchExplosions = tMainConfig.get("machines", "explosions_on_nonwrenching", true) + .getBoolean(false); + GregTech_API.sMachineWireFire = tMainConfig.get("machines", "wirefire_on_explosion", true).getBoolean(false); + GregTech_API.sMachineFireExplosions = tMainConfig.get("machines", "fire_causes_explosions", true) + .getBoolean(false); + GregTech_API.sMachineRainExplosions = tMainConfig.get("machines", "rain_causes_explosions", true) + .getBoolean(false); + GregTech_API.sMachineThunderExplosions = tMainConfig.get("machines", "lightning_causes_explosions", true) + .getBoolean(false); + GregTech_API.sConstantEnergy = tMainConfig.get("machines", "constant_need_of_energy", true).getBoolean(false); + GregTech_API.sColoredGUI = tMainConfig.get("machines", "colored_guis_when_painted", true).getBoolean(false); + GregTech_API.sMachineMetalGUI = tMainConfig.get("machines", "guis_in_consistent_machine_metal_color", false) .getBoolean(false); // Implementation for this is actually handled in NewHorizonsCoreMod in MainRegistry.java! - GregTech_API.sUseMachineMetal = - tMainConfig.get("machines", "use_machine_metal_tint", true).getBoolean(true); + GregTech_API.sUseMachineMetal = tMainConfig.get("machines", "use_machine_metal_tint", true).getBoolean(true); - GregTech_API.sTimber = - tMainConfig.get(GT_Mod.aTextGeneral, "timber_axe", true).getBoolean(true); - GregTech_API.sDrinksAlwaysDrinkable = tMainConfig - .get(GT_Mod.aTextGeneral, "drinks_always_drinkable", false) + GregTech_API.sTimber = tMainConfig.get(GT_Mod.aTextGeneral, "timber_axe", true).getBoolean(true); + GregTech_API.sDrinksAlwaysDrinkable = tMainConfig.get(GT_Mod.aTextGeneral, "drinks_always_drinkable", false) .getBoolean(false); GregTech_API.sDoShowAllItemsInCreative = tMainConfig - .get(GT_Mod.aTextGeneral, "show_all_metaitems_in_creative_and_NEI", false) - .getBoolean(false); - GregTech_API.sMultiThreadedSounds = tMainConfig - .get(GT_Mod.aTextGeneral, "sound_multi_threading", false) + .get(GT_Mod.aTextGeneral, "show_all_metaitems_in_creative_and_NEI", false).getBoolean(false); + GregTech_API.sMultiThreadedSounds = tMainConfig.get(GT_Mod.aTextGeneral, "sound_multi_threading", false) .getBoolean(false); loadClientConfig(); GT_Mod.gregtechproxy.mMaxEqualEntitiesAtOneSpot = tMainConfig - .get(GT_Mod.aTextGeneral, "MaxEqualEntitiesAtOneSpot", 3) - .getInt(3); + .get(GT_Mod.aTextGeneral, "MaxEqualEntitiesAtOneSpot", 3).getInt(3); GT_Mod.gregtechproxy.mSkeletonsShootGTArrows = tMainConfig - .get(GT_Mod.aTextGeneral, "SkeletonsShootGTArrows", 16) - .getInt(16); - GT_Mod.gregtechproxy.mFlintChance = - tMainConfig.get(GT_Mod.aTextGeneral, "FlintAndSteelChance", 30).getInt(30); - GT_Mod.gregtechproxy.mItemDespawnTime = - tMainConfig.get(GT_Mod.aTextGeneral, "ItemDespawnTime", 6000).getInt(6000); + .get(GT_Mod.aTextGeneral, "SkeletonsShootGTArrows", 16).getInt(16); + GT_Mod.gregtechproxy.mFlintChance = tMainConfig.get(GT_Mod.aTextGeneral, "FlintAndSteelChance", 30).getInt(30); + GT_Mod.gregtechproxy.mItemDespawnTime = tMainConfig.get(GT_Mod.aTextGeneral, "ItemDespawnTime", 6000) + .getInt(6000); GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation = tMainConfig - .get(GT_Mod.aTextGeneral, "AllowSmallBoilerAutomation", false) - .getBoolean(false); - GT_Mod.gregtechproxy.mHardMachineCasings = - tMainConfig.get(GT_Mod.aTextGeneral, "HardMachineCasings", true).getBoolean(true); - GT_Mod.gregtechproxy.mDisableVanillaOres = - tMainConfig.get(GT_Mod.aTextGeneral, "DisableVanillaOres", true).getBoolean(true); - GT_Mod.gregtechproxy.mNerfDustCrafting = - tMainConfig.get(GT_Mod.aTextGeneral, "NerfDustCrafting", true).getBoolean(true); - GT_Mod.gregtechproxy.mIncreaseDungeonLoot = tMainConfig - .get(GT_Mod.aTextGeneral, "IncreaseDungeonLoot", true) + .get(GT_Mod.aTextGeneral, "AllowSmallBoilerAutomation", false).getBoolean(false); + GT_Mod.gregtechproxy.mHardMachineCasings = tMainConfig.get(GT_Mod.aTextGeneral, "HardMachineCasings", true) + .getBoolean(true); + GT_Mod.gregtechproxy.mDisableVanillaOres = tMainConfig.get(GT_Mod.aTextGeneral, "DisableVanillaOres", true) + .getBoolean(true); + GT_Mod.gregtechproxy.mNerfDustCrafting = tMainConfig.get(GT_Mod.aTextGeneral, "NerfDustCrafting", true) .getBoolean(true); - GT_Mod.gregtechproxy.mAxeWhenAdventure = tMainConfig - .get(GT_Mod.aTextGeneral, "AdventureModeStartingAxe", true) + GT_Mod.gregtechproxy.mIncreaseDungeonLoot = tMainConfig.get(GT_Mod.aTextGeneral, "IncreaseDungeonLoot", true) .getBoolean(true); - GT_Mod.gregtechproxy.mHardcoreCables = - tMainConfig.get(GT_Mod.aTextGeneral, "HardCoreCableLoss", false).getBoolean(false); - GT_Mod.gregtechproxy.mSurvivalIntoAdventure = tMainConfig - .get(GT_Mod.aTextGeneral, "forceAdventureMode", false) + GT_Mod.gregtechproxy.mAxeWhenAdventure = tMainConfig.get(GT_Mod.aTextGeneral, "AdventureModeStartingAxe", true) + .getBoolean(true); + GT_Mod.gregtechproxy.mHardcoreCables = tMainConfig.get(GT_Mod.aTextGeneral, "HardCoreCableLoss", false) + .getBoolean(false); + GT_Mod.gregtechproxy.mSurvivalIntoAdventure = tMainConfig.get(GT_Mod.aTextGeneral, "forceAdventureMode", false) .getBoolean(false); - GT_Mod.gregtechproxy.mHungerEffect = - tMainConfig.get(GT_Mod.aTextGeneral, "AFK_Hunger", false).getBoolean(false); - GT_Mod.gregtechproxy.mHardRock = - tMainConfig.get(GT_Mod.aTextGeneral, "harderstone", false).getBoolean(false); - GT_Mod.gregtechproxy.mInventoryUnification = tMainConfig - .get(GT_Mod.aTextGeneral, "InventoryUnification", true) + GT_Mod.gregtechproxy.mHungerEffect = tMainConfig.get(GT_Mod.aTextGeneral, "AFK_Hunger", false) + .getBoolean(false); + GT_Mod.gregtechproxy.mHardRock = tMainConfig.get(GT_Mod.aTextGeneral, "harderstone", false).getBoolean(false); + GT_Mod.gregtechproxy.mInventoryUnification = tMainConfig.get(GT_Mod.aTextGeneral, "InventoryUnification", true) .getBoolean(true); - GT_Mod.gregtechproxy.mGTBees = - tMainConfig.get(GT_Mod.aTextGeneral, "GTBees", true).getBoolean(true); - GT_Mod.gregtechproxy.mCraftingUnification = tMainConfig - .get(GT_Mod.aTextGeneral, "CraftingUnification", true) + GT_Mod.gregtechproxy.mGTBees = tMainConfig.get(GT_Mod.aTextGeneral, "GTBees", true).getBoolean(true); + GT_Mod.gregtechproxy.mCraftingUnification = tMainConfig.get(GT_Mod.aTextGeneral, "CraftingUnification", true) .getBoolean(true); - GT_Mod.gregtechproxy.mNerfedWoodPlank = tMainConfig - .get(GT_Mod.aTextGeneral, "WoodNeedsSawForCrafting", true) + GT_Mod.gregtechproxy.mNerfedWoodPlank = tMainConfig.get(GT_Mod.aTextGeneral, "WoodNeedsSawForCrafting", true) .getBoolean(true); GT_Mod.gregtechproxy.mNerfedVanillaTools = tMainConfig - .get(GT_Mod.aTextGeneral, "smallerVanillaToolDurability", true) + .get(GT_Mod.aTextGeneral, "smallerVanillaToolDurability", true).getBoolean(true); + GT_Mod.gregtechproxy.mSortToTheEnd = tMainConfig.get(GT_Mod.aTextGeneral, "EnsureToBeLoadedLast", true) .getBoolean(true); - GT_Mod.gregtechproxy.mSortToTheEnd = tMainConfig - .get(GT_Mod.aTextGeneral, "EnsureToBeLoadedLast", true) + GT_Mod.gregtechproxy.mDisableIC2Cables = tMainConfig.get(GT_Mod.aTextGeneral, "DisableIC2Cables", true) .getBoolean(true); - GT_Mod.gregtechproxy.mDisableIC2Cables = - tMainConfig.get(GT_Mod.aTextGeneral, "DisableIC2Cables", true).getBoolean(true); - GT_Mod.gregtechproxy.mAchievements = - tMainConfig.get(GT_Mod.aTextGeneral, "EnableAchievements", true).getBoolean(true); - GT_Mod.gregtechproxy.mAE2Integration = - GregTech_API.sSpecialFile.get(ConfigCategories.general, "EnableAE2Integration", GregTech_API.mAE2); - GT_Mod.gregtechproxy.mNerfedCombs = - tMainConfig.get(GT_Mod.aTextGeneral, "NerfCombs", true).getBoolean(true); - GT_Mod.gregtechproxy.mNerfedCrops = - tMainConfig.get(GT_Mod.aTextGeneral, "NerfCrops", true).getBoolean(true); - GT_Mod.gregtechproxy.mHideUnusedOres = - tMainConfig.get(GT_Mod.aTextGeneral, "HideUnusedOres", true).getBoolean(true); - GT_Mod.gregtechproxy.mHideRecyclingRecipes = tMainConfig - .get(GT_Mod.aTextGeneral, "HideRecyclingRecipes", true) + GT_Mod.gregtechproxy.mAchievements = tMainConfig.get(GT_Mod.aTextGeneral, "EnableAchievements", true) .getBoolean(true); - GT_Mod.gregtechproxy.mArcSmeltIntoAnnealed = tMainConfig - .get(GT_Mod.aTextGeneral, "ArcSmeltIntoAnnealedWrought", true) + GT_Mod.gregtechproxy.mAE2Integration = GregTech_API.sSpecialFile + .get(ConfigCategories.general, "EnableAE2Integration", GregTech_API.mAE2); + GT_Mod.gregtechproxy.mNerfedCombs = tMainConfig.get(GT_Mod.aTextGeneral, "NerfCombs", true).getBoolean(true); + GT_Mod.gregtechproxy.mNerfedCrops = tMainConfig.get(GT_Mod.aTextGeneral, "NerfCrops", true).getBoolean(true); + GT_Mod.gregtechproxy.mHideUnusedOres = tMainConfig.get(GT_Mod.aTextGeneral, "HideUnusedOres", true) .getBoolean(true); - GT_Mod.gregtechproxy.mEnableAllMaterials = - tMainConfig.get("general", "EnableAllMaterials", false).getBoolean(false); - GT_Mod.gregtechproxy.mEnableAllComponents = - tMainConfig.get("general", "EnableAllComponents", false).getBoolean(false); + GT_Mod.gregtechproxy.mHideRecyclingRecipes = tMainConfig.get(GT_Mod.aTextGeneral, "HideRecyclingRecipes", true) + .getBoolean(true); + GT_Mod.gregtechproxy.mArcSmeltIntoAnnealed = tMainConfig + .get(GT_Mod.aTextGeneral, "ArcSmeltIntoAnnealedWrought", true).getBoolean(true); + GT_Mod.gregtechproxy.mEnableAllMaterials = tMainConfig.get("general", "EnableAllMaterials", false) + .getBoolean(false); + GT_Mod.gregtechproxy.mEnableAllComponents = tMainConfig.get("general", "EnableAllComponents", false) + .getBoolean(false); // Pollution: edit GT_Proxy.java to change default values GT_Mod.gregtechproxy.mPollution = tMainConfig @@ -764,18 +581,16 @@ public class GT_PreLoad { "PollutionBaseDieselGenerator", GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond) .getInt(GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond); - double[] mPollutionDieselGeneratorReleasedByTier = tMainConfig - .get( - "Pollution", - "PollutionReleasedByTierDieselGenerator", - GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier) - .getDoubleList(); + double[] mPollutionDieselGeneratorReleasedByTier = tMainConfig.get( + "Pollution", + "PollutionReleasedByTierDieselGenerator", + GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier).getDoubleList(); if (mPollutionDieselGeneratorReleasedByTier.length == GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier.length) { GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier = mPollutionDieselGeneratorReleasedByTier; } else { - GT_FML_LOGGER.error( - "The Length of the Diesel Turbine Pollution Array Config must be the same as the Default"); + GT_FML_LOGGER + .error("The Length of the Diesel Turbine Pollution Array Config must be the same as the Default"); } GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond = tMainConfig .get( @@ -783,12 +598,10 @@ public class GT_PreLoad { "PollutionBaseGasTurbineGenerator", GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond) .getInt(GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond); - double[] mPollutionGasTurbineReleasedByTier = tMainConfig - .get( - "Pollution", - "PollutionReleasedByTierGasTurbineGenerator", - GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier) - .getDoubleList(); + double[] mPollutionGasTurbineReleasedByTier = tMainConfig.get( + "Pollution", + "PollutionReleasedByTierGasTurbineGenerator", + GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier).getDoubleList(); if (mPollutionGasTurbineReleasedByTier.length == GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier.length) { GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier = mPollutionGasTurbineReleasedByTier; @@ -797,25 +610,21 @@ public class GT_PreLoad { } GT_Mod.gregtechproxy.mUndergroundOil.getConfig(tMainConfig, "undergroundfluid"); - GT_Mod.gregtechproxy.mEnableCleanroom = - tMainConfig.get("general", "EnableCleanroom", true).getBoolean(true); + GT_Mod.gregtechproxy.mEnableCleanroom = tMainConfig.get("general", "EnableCleanroom", true).getBoolean(true); if (GT_Mod.gregtechproxy.mEnableCleanroom) GT_MetaTileEntity_Cleanroom.loadConfig(tMainConfig); GT_Mod.gregtechproxy.mLowGravProcessing = Loader.isModLoaded(GT_Values.MOD_ID_GC_CORE) && tMainConfig.get("general", "LowGravProcessing", true).getBoolean(true); GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList = tMainConfig - .get("general", "GTNH Optimised Material Loading", true) - .getBoolean(true); + .get("general", "GTNH Optimised Material Loading", true).getBoolean(true); Calendar now = Calendar.getInstance(); GT_Mod.gregtechproxy.mAprilFool = GregTech_API.sSpecialFile.get( ConfigCategories.general, "AprilFool", now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) == 1); - GT_Mod.gregtechproxy.mCropNeedBlock = - tMainConfig.get("general", "CropNeedBlockBelow", true).getBoolean(true); - GT_Mod.gregtechproxy.mDisableOldChemicalRecipes = - tMainConfig.get("general", "DisableOldChemicalRecipes", false).getBoolean(false); - GT_Mod.gregtechproxy.mAMHInteraction = tMainConfig - .get("general", "AllowAutoMaintenanceHatchInteraction", false) + GT_Mod.gregtechproxy.mCropNeedBlock = tMainConfig.get("general", "CropNeedBlockBelow", true).getBoolean(true); + GT_Mod.gregtechproxy.mDisableOldChemicalRecipes = tMainConfig.get("general", "DisableOldChemicalRecipes", false) + .getBoolean(false); + GT_Mod.gregtechproxy.mAMHInteraction = tMainConfig.get("general", "AllowAutoMaintenanceHatchInteraction", false) .getBoolean(false); GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true); GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false); @@ -823,159 +632,135 @@ public class GT_PreLoad { GregTech_API.mRFtoEU = GregTech_API.sOPStuff.get(ConfigCategories.general, "100RFtoEU", 20); GregTech_API.mRFExplosions = GregTech_API.sOPStuff.get(ConfigCategories.general, "RFExplosions", false); GregTech_API.meIOLoaded = Loader.isModLoaded("EnderIO"); - GT_Mod.gregtechproxy.mForceFreeFace = - GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "forceFreeFace", true); - GT_Mod.gregtechproxy.mBrickedBlastFurnace = - tMainConfig.get("general", "BrickedBlastFurnace", true).getBoolean(true); - GT_Mod.gregtechproxy.mEasierIVPlusCables = - tMainConfig.get("general", "EasierEVPlusCables", false).getBoolean(false); - GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = tMainConfig - .get("general", "MixedOreOnlyYieldsTwoThirdsOfPureOre", false) + GT_Mod.gregtechproxy.mForceFreeFace = GregTech_API.sMachineFile + .get(ConfigCategories.machineconfig, "forceFreeFace", true); + GT_Mod.gregtechproxy.mBrickedBlastFurnace = tMainConfig.get("general", "BrickedBlastFurnace", true) + .getBoolean(true); + GT_Mod.gregtechproxy.mEasierIVPlusCables = tMainConfig.get("general", "EasierEVPlusCables", false) .getBoolean(false); - GT_Mod.gregtechproxy.enableBlackGraniteOres = GregTech_API.sWorldgenFile.get( - "general", "enableBlackGraniteOres", GT_Mod.gregtechproxy.enableBlackGraniteOres); - GT_Mod.gregtechproxy.enableRedGraniteOres = GregTech_API.sWorldgenFile.get( - "general", "enableRedGraniteOres", GT_Mod.gregtechproxy.enableRedGraniteOres); - GT_Mod.gregtechproxy.enableMarbleOres = - GregTech_API.sWorldgenFile.get("general", "enableMarbleOres", GT_Mod.gregtechproxy.enableMarbleOres); - GT_Mod.gregtechproxy.enableBasaltOres = - GregTech_API.sWorldgenFile.get("general", "enableBasaltOres", GT_Mod.gregtechproxy.enableBasaltOres); - GT_Mod.gregtechproxy.gt6Pipe = - tMainConfig.get("general", "GT6StyledPipesConnection", true).getBoolean(true); - GT_Mod.gregtechproxy.gt6Cable = - tMainConfig.get("general", "GT6StyledWiresConnection", true).getBoolean(true); - GT_Mod.gregtechproxy.ic2EnergySourceCompat = - tMainConfig.get("general", "Ic2EnergySourceCompat", true).getBoolean(true); + GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = tMainConfig + .get("general", "MixedOreOnlyYieldsTwoThirdsOfPureOre", false).getBoolean(false); + GT_Mod.gregtechproxy.enableBlackGraniteOres = GregTech_API.sWorldgenFile + .get("general", "enableBlackGraniteOres", GT_Mod.gregtechproxy.enableBlackGraniteOres); + GT_Mod.gregtechproxy.enableRedGraniteOres = GregTech_API.sWorldgenFile + .get("general", "enableRedGraniteOres", GT_Mod.gregtechproxy.enableRedGraniteOres); + GT_Mod.gregtechproxy.enableMarbleOres = GregTech_API.sWorldgenFile + .get("general", "enableMarbleOres", GT_Mod.gregtechproxy.enableMarbleOres); + GT_Mod.gregtechproxy.enableBasaltOres = GregTech_API.sWorldgenFile + .get("general", "enableBasaltOres", GT_Mod.gregtechproxy.enableBasaltOres); + GT_Mod.gregtechproxy.gt6Pipe = tMainConfig.get("general", "GT6StyledPipesConnection", true).getBoolean(true); + GT_Mod.gregtechproxy.gt6Cable = tMainConfig.get("general", "GT6StyledWiresConnection", true).getBoolean(true); + GT_Mod.gregtechproxy.ic2EnergySourceCompat = tMainConfig.get("general", "Ic2EnergySourceCompat", true) + .getBoolean(true); GT_Mod.gregtechproxy.costlyCableConnection = tMainConfig - .get("general", "CableConnectionRequiresSolderingMaterial", false) - .getBoolean(false); + .get("general", "CableConnectionRequiresSolderingMaterial", false).getBoolean(false); GT_LanguageManager.i18nPlaceholder = tMainConfig - .get("general", "EnablePlaceholderForMaterialNamesInLangFile", true) - .getBoolean(true); + .get("general", "EnablePlaceholderForMaterialNamesInLangFile", true).getBoolean(true); GT_MetaTileEntity_LongDistancePipelineBase.minimalDistancePoints = tMainConfig - .get("general", "LongDistancePipelineMinimalDistancePoints", 64) - .getInt(64); + .get("general", "LongDistancePipelineMinimalDistancePoints", 64).getInt(64); GregTech_API.mUseOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get( ConfigCategories.Recipes.harderrecipes, "useonlygoodsolderingmaterials", GregTech_API.mUseOnlyGoodSolderingMaterials); - GT_Mod.gregtechproxy.mChangeHarvestLevels = - GregTech_API.sMaterialProperties.get("havestLevel", "activateHarvestLevelChange", false); // TODO CHECK + GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties + .get("havestLevel", "activateHarvestLevelChange", false); // TODO CHECK if (GT_Mod.gregtechproxy.mChangeHarvestLevels) { - GT_Mod.gregtechproxy.mGraniteHavestLevel = - GregTech_API.sMaterialProperties.get("havestLevel", "graniteHarvestLevel", 3); - GT_Mod.gregtechproxy.mMaxHarvestLevel = - Math.min(15, GregTech_API.sMaterialProperties.get("havestLevel", "maxLevel", 7)); + GT_Mod.gregtechproxy.mGraniteHavestLevel = GregTech_API.sMaterialProperties + .get("havestLevel", "graniteHarvestLevel", 3); + GT_Mod.gregtechproxy.mMaxHarvestLevel = Math + .min(15, GregTech_API.sMaterialProperties.get("havestLevel", "maxLevel", 7)); Materials.getMaterialsMap().values().parallelStream() - .filter(tMaterial -> tMaterial != null - && tMaterial.mToolQuality > 0 - && tMaterial.mMetaItemSubID < GT_Mod.gregtechproxy.mHarvestLevel.length - && tMaterial.mMetaItemSubID >= 0) - .forEach(tMaterial -> GT_Mod.gregtechproxy.mHarvestLevel[tMaterial.mMetaItemSubID] = - GregTech_API.sMaterialProperties.get( - "materialHavestLevel", tMaterial.mDefaultLocalName, tMaterial.mToolQuality)); + .filter( + tMaterial -> tMaterial != null && tMaterial.mToolQuality > 0 + && tMaterial.mMetaItemSubID < GT_Mod.gregtechproxy.mHarvestLevel.length + && tMaterial.mMetaItemSubID >= 0) + .forEach( + tMaterial -> GT_Mod.gregtechproxy.mHarvestLevel[tMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties + .get("materialHavestLevel", tMaterial.mDefaultLocalName, tMaterial.mToolQuality)); } if (tMainConfig.get("general", "hardermobspawners", true).getBoolean(true)) { Blocks.mob_spawner.setHardness(500.0F).setResistance(6000000.0F); } - GT_Mod.gregtechproxy.mOnline = - tMainConfig.get(GT_Mod.aTextGeneral, "online", true).getBoolean(false); + GT_Mod.gregtechproxy.mOnline = tMainConfig.get(GT_Mod.aTextGeneral, "online", true).getBoolean(false); - GT_Mod.gregtechproxy.mUpgradeCount = Math.min( - 64, - Math.max(1, tMainConfig.get("features", "UpgradeStacksize", 4).getInt())); + GT_Mod.gregtechproxy.mUpgradeCount = Math + .min(64, Math.max(1, tMainConfig.get("features", "UpgradeStacksize", 4).getInt())); for (OrePrefixes tPrefix : OrePrefixes.values()) { if (tPrefix.mIsUsedForOreProcessing) { - tPrefix.mDefaultStackSize = ((byte) Math.min( - 64, - Math.max( - 1, - tMainConfig - .get("features", "MaxOreStackSize", 64) - .getInt()))); + tPrefix.mDefaultStackSize = ((byte) Math + .min(64, Math.max(1, tMainConfig.get("features", "MaxOreStackSize", 64).getInt()))); } else if (tPrefix == OrePrefixes.plank) { - tPrefix.mDefaultStackSize = ((byte) Math.min( - 64, - Math.max( - 16, - tMainConfig - .get("features", "MaxPlankStackSize", 64) - .getInt()))); - } else if ((tPrefix == OrePrefixes.wood) - || (tPrefix == OrePrefixes.treeLeaves) + tPrefix.mDefaultStackSize = ((byte) Math + .min(64, Math.max(16, tMainConfig.get("features", "MaxPlankStackSize", 64).getInt()))); + } else if ((tPrefix == OrePrefixes.wood) || (tPrefix == OrePrefixes.treeLeaves) || (tPrefix == OrePrefixes.treeSapling) || (tPrefix == OrePrefixes.log)) { - tPrefix.mDefaultStackSize = ((byte) Math.min( - 64, - Math.max( - 16, - tMainConfig - .get("features", "MaxLogStackSize", 64) - .getInt()))); - } else if (tPrefix.mIsUsedForBlocks) { - tPrefix.mDefaultStackSize = ((byte) Math.min( - 64, - Math.max( - 16, - tMainConfig - .get("features", "MaxOtherBlockStackSize", 64) - .getInt()))); - } + tPrefix.mDefaultStackSize = ((byte) Math + .min(64, Math.max(16, tMainConfig.get("features", "MaxLogStackSize", 64).getInt()))); + } else + if (tPrefix.mIsUsedForBlocks) { + tPrefix.mDefaultStackSize = ((byte) Math + .min(64, Math.max(16, tMainConfig.get("features", "MaxOtherBlockStackSize", 64).getInt()))); + } } - GT_Values.mCTMEnabledBlock.addAll(Arrays.asList(tMainConfig - .get("general", "ctm_block_whitelist", new String[] { - "team.chisel.block.BlockCarvable", "team.chisel.block.BlockCarvableGlass" - }) - .getStringList())); - GT_Values.mCTMDisabledBlock.addAll(Arrays.asList(tMainConfig - .get("general", "ctm_block_blacklist", new String[] {"team.chisel.block.BlockRoadLine"}) - .getStringList())); + GT_Values.mCTMEnabledBlock.addAll( + Arrays.asList( + tMainConfig.get( + "general", + "ctm_block_whitelist", + new String[] { "team.chisel.block.BlockCarvable", + "team.chisel.block.BlockCarvableGlass" }) + .getStringList())); + GT_Values.mCTMDisabledBlock.addAll( + Arrays.asList( + tMainConfig.get( + "general", + "ctm_block_blacklist", + new String[] { "team.chisel.block.BlockRoadLine" }).getStringList())); } public static void loadClientConfig() { final String sBDye0 = "ColorModulation."; - Arrays.stream(Dyes.values()) - .filter(tDye -> (tDye != Dyes._NULL) && (tDye.mIndex < 0)) - .forEach(tDye -> { - String sBDye1 = sBDye0 + tDye; - tDye.mRGBa[0] = ((short) Math.min( - 255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "R", tDye.mOriginalRGBa[0])))); - tDye.mRGBa[1] = ((short) Math.min( - 255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "G", tDye.mOriginalRGBa[1])))); - tDye.mRGBa[2] = ((short) Math.min( - 255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "B", tDye.mOriginalRGBa[2])))); - }); - GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion = - GregTech_API.sClientDataFile.get("render", "TileAmbientOcclusion", true); + Arrays.stream(Dyes.values()).filter(tDye -> (tDye != Dyes._NULL) && (tDye.mIndex < 0)).forEach(tDye -> { + String sBDye1 = sBDye0 + tDye; + tDye.mRGBa[0] = ((short) Math + .min(255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "R", tDye.mOriginalRGBa[0])))); + tDye.mRGBa[1] = ((short) Math + .min(255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "G", tDye.mOriginalRGBa[1])))); + tDye.mRGBa[2] = ((short) Math + .min(255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "B", tDye.mOriginalRGBa[2])))); + }); + GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion = GregTech_API.sClientDataFile + .get("render", "TileAmbientOcclusion", true); GT_Mod.gregtechproxy.mRenderGlowTextures = GregTech_API.sClientDataFile.get("render", "GlowTextures", true); - GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped = - GregTech_API.sClientDataFile.get("render", "RenderFlippedMachinesFlipped", true); - GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch = - GregTech_API.sClientDataFile.get("render", "RenderIndicatorsOnHatch", true); - GT_Mod.gregtechproxy.mRenderDirtParticles = - GregTech_API.sClientDataFile.get("render", "RenderDirtParticles", true); - GT_Mod.gregtechproxy.mRenderPollutionFog = - GregTech_API.sClientDataFile.get("render", "RenderPollutionFog", true); - - GT_Mod.gregtechproxy.mCoverTabsVisible = - GregTech_API.sClientDataFile.get("interface", "DisplayCoverTabs", true); + GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped = GregTech_API.sClientDataFile + .get("render", "RenderFlippedMachinesFlipped", true); + GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch = GregTech_API.sClientDataFile + .get("render", "RenderIndicatorsOnHatch", true); + GT_Mod.gregtechproxy.mRenderDirtParticles = GregTech_API.sClientDataFile + .get("render", "RenderDirtParticles", true); + GT_Mod.gregtechproxy.mRenderPollutionFog = GregTech_API.sClientDataFile + .get("render", "RenderPollutionFog", true); + + GT_Mod.gregtechproxy.mCoverTabsVisible = GregTech_API.sClientDataFile + .get("interface", "DisplayCoverTabs", true); GT_Mod.gregtechproxy.mCoverTabsFlipped = GregTech_API.sClientDataFile.get("interface", "FlipCoverTabs", false); GT_Mod.gregtechproxy.mTooltipVerbosity = GregTech_API.sClientDataFile.get("interface", "TooltipVerbosity", 2); - GT_Mod.gregtechproxy.mTooltipShiftVerbosity = - GregTech_API.sClientDataFile.get("interface", "TooltipShiftVerbosity", 3); + GT_Mod.gregtechproxy.mTooltipShiftVerbosity = GregTech_API.sClientDataFile + .get("interface", "TooltipShiftVerbosity", 3); GT_Mod.gregtechproxy.mTitleTabStyle = GregTech_API.sClientDataFile.get("interface", "TitleTabStyle", 0); GT_Mod.gregtechproxy.mNEIRecipeSecondMode = GregTech_API.sClientDataFile.get("nei", "RecipeSecondMode", true); GT_Mod.gregtechproxy.mNEIRecipeOwner = GregTech_API.sClientDataFile.get("nei", "RecipeOwner", false); - GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace = - GregTech_API.sClientDataFile.get("nei", "RecipeOwnerStackTrace", false); + GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTech_API.sClientDataFile + .get("nei", "RecipeOwnerStackTrace", false); GT_Mod.gregtechproxy.mNEIOriginalVoltage = GregTech_API.sClientDataFile.get("nei", "OriginalVoltage", false); - GT_Mod.gregtechproxy.mWailaTransformerVoltageTier = - GregTech_API.sClientDataFile.get("waila", "WailaTransformerVoltageTier", true); + GT_Mod.gregtechproxy.mWailaTransformerVoltageTier = GregTech_API.sClientDataFile + .get("waila", "WailaTransformerVoltageTier", true); final String[] Circuits = GregTech_API.sClientDataFile.get("interface", "CircuitsOrder"); GT_Mod.gregtechproxy.mCircuitsOrder.clear(); |