diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2016-06-20 02:01:03 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-06-20 02:01:03 +1000 |
commit | 92cedd818ccdb57085b14c8ed735e903479ac581 (patch) | |
tree | 381e97ba38cdd36359ce5d386bbeec85ba90fe81 /src/Java/miscutil/core | |
parent | 92f6969706a9c8c4cbe1bcc6a96c6d1de4f6185d (diff) | |
download | GT5-Unofficial-92cedd818ccdb57085b14c8ed735e903479ac581.tar.gz GT5-Unofficial-92cedd818ccdb57085b14c8ed735e903479ac581.tar.bz2 GT5-Unofficial-92cedd818ccdb57085b14c8ed735e903479ac581.zip |
+Added New Circuits & Components along with recipes.
+Added A complete set of Machine components up to MAX voltage along with recipes.
+Started Initial work on multiblock items (Similar to the turbine rotor needed in Large turbines)
+Added better support for future recipe additions.
Diffstat (limited to 'src/Java/miscutil/core')
8 files changed, 412 insertions, 20 deletions
diff --git a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMachines.java index 6bc433b93a..21cacd8dab 100644 --- a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMachines.java +++ b/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMachines.java @@ -1,18 +1,19 @@ package miscutil.core.creative.tabs; +import miscutil.core.item.ModItems; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; import net.minecraft.item.Item; public class MiscUtilCreativeTabMachines extends CreativeTabs { + public MiscUtilCreativeTabMachines(String lable) { super(lable); } @Override - public Item getTabIconItem() { - return Items.experience_bottle; + public Item getTabIconItem() { + return ModItems.itemPLACEHOLDER_Circuit; } } diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index 078c3984ac..4ab66d3099 100644 --- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -31,6 +31,7 @@ import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.recipe.RECIPES_GREGTECH; +import miscutil.core.recipe.RECIPES_LaserEngraver; import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; @@ -74,6 +75,8 @@ public class COMPAT_HANDLER { public static void registerGregtechMachines() { if (Gregtech) { new MetaGeneratedGregtechItems(); + new RECIPES_LaserEngraver(); + //new MetaGeneratedGregtechTools(); GregtechEnergyBuffer.run(); GregtechConduits.run(); GregtechSteamCondenser.run(); diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java index ce7f24c2aa..1992a084c9 100644 --- a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java @@ -1,6 +1,7 @@ package miscutil.core.handler.registration; import miscutil.core.handler.COMPAT_HANDLER; +import miscutil.core.recipe.RECIPES_MachineComponents; import miscutil.core.recipe.RECIPES_Machines; import miscutil.core.recipe.RECIPES_Shapeless; import miscutil.core.recipe.RECIPES_Tools; @@ -19,6 +20,7 @@ public class RegistrationHandler { RECIPES_Tools.RECIPES_LOAD(); RECIPES_Machines.RECIPES_LOAD(); RECIPES_Shapeless.RECIPES_LOAD(); + RECIPES_MachineComponents.RECIPES_LOAD(); //RECIPES_MTWRAPPER.run(); Utils.LOG_INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed); COMPAT_HANDLER.areInitItemsLoaded = true; diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 6da428c924..aa0a95e07f 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -1,4 +1,5 @@ package miscutil.core.item; +import static miscutil.core.creative.AddToCreativeTab.tabMachines; import static miscutil.core.creative.AddToCreativeTab.tabMisc; import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT; import miscutil.core.creative.AddToCreativeTab; @@ -98,7 +99,7 @@ Gold Tool: 22*/ public static Item itemIngotBatteryAlloy; public static Item itemPlateBatteryAlloy; public static Item itemHeliumBlob; - public static Item item_PLEASE_FACTOR_ME_4; + public static Item itemPLACEHOLDER_Circuit; public static Item FuelRod_Empty; public static Item FuelRod_Thorium; @@ -269,26 +270,23 @@ Gold Tool: 22*/ Item itemBufferCore; for(int i=1; i<=10; i++){ //Utils.LOG_INFO(""+i); - itemBufferCore = new BufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMisc); + itemBufferCore = new BufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName()+i); //System.out.println("Buffer Core registration count is: "+i); } - //Dev Items - itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemStickyRubber"); + itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber"); GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber"); //Battery Alloy For cheap Niggers - itemIngotBatteryAlloy = new Item().setUnlocalizedName("itemIngotBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotBatteryAlloy"); + itemIngotBatteryAlloy = new Item().setUnlocalizedName("itemIngotBatteryAlloy").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemIngotBatteryAlloy"); GameRegistry.registerItem(itemIngotBatteryAlloy, "itemIngotBatteryAlloy"); - itemPlateBatteryAlloy = new Item().setUnlocalizedName("itemPlateBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateBatteryAlloy"); + itemPlateBatteryAlloy = new Item().setUnlocalizedName("itemPlateBatteryAlloy").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemPlateBatteryAlloy"); GameRegistry.registerItem(itemPlateBatteryAlloy, "itemPlateBatteryAlloy"); itemHeliumBlob = new Item().setUnlocalizedName("itemHeliumBlob").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob"); GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob"); - - - /* - item_PLEASE_FACTOR_ME_4 = new Item().setUnlocalizedName("unlocalName4").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); - GameRegistry.registerItem(item_PLEASE_FACTOR_ME_4, "localName4");*/ + + itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit").setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit"); + GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); //Try some New Tools from GT //GT_Tool_Item x = null; //x = GregTech_API.constructHardHammerItem("rockBelter", "Sandstone Hammer", 5000 /**Max Damage**/,50 /**Entity Damage**/); diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index 1e9f9b90dc..8473ff3bcc 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import miscutil.core.creative.AddToCreativeTab; +import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.gregtech.api.interfaces.internal.IGregtech_RecipeAdder; import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; @@ -28,6 +29,10 @@ public class CORE { public static IIconRegister GT_BlockIcons, GT_ItemIcons; public static List<Runnable> GT_BlockIconload = new ArrayList<Runnable>(); public static final Class<AddToCreativeTab> TAB = AddToCreativeTab.class; + /** + * A List containing all the Materials, which are somehow in use by GT and therefor receive a specific Set of Items. + */ + public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000]; //GUIS public enum GUI_ENUM diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java index 7ff30f03d7..128e4046cb 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java @@ -2,7 +2,6 @@ package miscutil.core.recipe; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; @@ -57,7 +56,7 @@ public class RECIPES_GREGTECH { CORE.RA.addCokeOvenRecipe( GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 2L), //Input 1 GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1L), //Input 2 - Materials.SaltWater.getFluid(85L), //Fluid Input + Materials.Oxygen.getFluid(85L), //Fluid Input Materials.Creosote.getFluid(145L), //Fluid Output GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 2L), //Item Output 1200, //Time in ticks @@ -70,7 +69,7 @@ public class RECIPES_GREGTECH { CORE.RA.addCokeOvenRecipe( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 1 GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2 - Materials.SaltWater.getFluid(185L), //Fluid Input + Materials.Oxygen.getFluid(185L), //Fluid Input Materials.Creosote.getFluid(200L), //Fluid Output UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output 900, //Time in ticks @@ -86,8 +85,9 @@ public class RECIPES_GREGTECH { private static void addFuels(){ Utils.LOG_INFO("Registering New Fuels."); - CORE.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketRocket_fuel", 1L, 1), null, 2800, 0); - CORE.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketHootch", 1L, 1), null, 2800, 0); - CORE.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketFire_water", 1L, 1), null, 2800, 0); + //CORE.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketRocket_fuel", 1L, 1), null, 2800, 0); + //CORE.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketHootch", 1L, 1), null, 2800, 0); + //CORE.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketFire_water", 1L, 1), null, 2800, 0); + //System.exit(1); } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java b/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java new file mode 100644 index 0000000000..3d8f7862ee --- /dev/null +++ b/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java @@ -0,0 +1,32 @@ +package miscutil.core.recipe; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OreDictNames; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.interfaces.IOreRecipeRegistrator; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import miscutil.gregtech.api.enums.GregtechItemList; +import net.minecraft.item.ItemStack; + +public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { + public RECIPES_LaserEngraver() { + OrePrefixes.crafting.add(this); + } + + @Override + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString())) { + GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.YttriumBariumCuprate, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), 64, 480); + } else if (aOreDictName.equals(OreDictNames.craftingLensYellow.toString())) { + GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_LuV.get(1L, new Object[0]), 64, 1024); + } else if (aOreDictName.equals(OreDictNames.craftingLensCyan.toString())) { + } else if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) { + } else if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) { + GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_ZPM.get(1L, new Object[0]), 64, 2000); + } else if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) { + + } + } +} diff --git a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java new file mode 100644 index 0000000000..1cefaadd1e --- /dev/null +++ b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java @@ -0,0 +1,351 @@ +package miscutil.core.recipe; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.util.Utils; +import miscutil.core.util.recipe.UtilsRecipe; +import miscutil.gregtech.api.enums.GregtechItemList; +import net.minecraft.item.ItemStack; + +public class RECIPES_MachineComponents { + + //Outputs + static ItemStack RECIPE_Circuit_IV = GregtechItemList.Circuit_IV.get(1); + static ItemStack RECIPE_Circuit_LuV = GregtechItemList.Circuit_LuV.get(1); + static ItemStack RECIPE_Circuit_ZPM = GregtechItemList.Circuit_ZPM.get(1); + static ItemStack RECIPE_Circuit_Board_IV = GregtechItemList.Circuit_Board_IV.get(1); + static ItemStack RECIPE_Circuit_Board_LuV = GregtechItemList.Circuit_Board_LuV.get(1); + static ItemStack RECIPE_Circuit_Board_ZPM = GregtechItemList.Circuit_Board_ZPM.get(1); + static ItemStack RECIPE_Circuit_Parts_Crystal_Chip_IV = GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(1); + static ItemStack RECIPE_Circuit_Parts_Crystal_Chip_LuV = GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(1); + static ItemStack RECIPE_Circuit_Parts_Crystal_Chip_ZPM = GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(1); + static ItemStack RECIPE_Circuit_Parts_IV = GregtechItemList.Circuit_Parts_IV.get(1); + static ItemStack RECIPE_Circuit_Parts_LuV = GregtechItemList.Circuit_Parts_LuV.get(1); + static ItemStack RECIPE_Circuit_Parts_ZPM = GregtechItemList.Circuit_Parts_ZPM.get(1); + + //Wire + static String wireTier6 = "wireGt08NiobiumTitanium"; + static String wireTier7 = "wireGt08Osmium"; + static String wireTier8 = "wireGt08Naquadah"; + static String wireTier9 = "wireGt08Superconductor"; + static String wireTier10 = "wireGt16Superconductor"; + + //Wire + static String cableTier6 = "cableGt04Tungsten"; + static String cableTier7 = "cableGt04NiobiumTitanium"; + static String cableTier8 = "cableGt04Osmium"; + static String cableTier9 = "cableGt04Naquadah"; + static String cableTier10 = "wireGt08Superconductor"; + + //Plates + static String plateTier7 = "plateChrome"; + static String plateTier8 = "plateIridium"; + static String plateTier9 = "plateOsmium"; + static String plateTier10 = "plateNeutronium"; + + //rods + static String rodTier7a = "stickChrome"; + static String rodTier8a = "stickIridium"; + static String rodTier9a = "stickOsmium"; + static String rodTier10a = "stickNeutronium"; + static String rodTier7b = "stickPlatinum"; + static String rodTier8b = "stickChrome"; + static String rodTier9b = "stickIridium"; + static String rodTier10b = "stickOsmium"; + static String rodTier7c = "stickTitanium"; + static String rodTier8c = "stickTungstenSteel"; + static String rodTier9c = "stickNaquadah"; + static String rodTier10c = "stickOsmium"; + + //Screws + static String screwTier7 = "screwChrome"; + static String screwTier8 = "screwIridium"; + static String screwTier9 = "screwOsmium"; + static String screwTier10 = "screwNeutronium"; + + //Rotors + static String rotorTier7 = "rotorChrome"; + static String rotorTier8 = "rotorIridium"; + static String rotorTier9 = "rotorOsmium"; + static String rotorTier10 = "rotorNeutronium"; + + //Fluid Pipe + static String pipeTier7 = "pipeHugeSteel"; + static String pipeTier8 = "pipeHugeStainlessSteel"; + static String pipeTier9 = "pipeHugeTitanium"; + static String pipeTier10 = "pipeHugeTungstenSteel"; + + //Rubber Ring/Plate + static String itemRubberRing = "ringRubber"; + static String plateRubber = "plateRubber"; + + //Circuits + static String circuitTier6 = "circuitMaster"; + static String circuitTier7 = "circuitUltimate"; + static String circuitTier8 = "circuitSymbiotic"; + static String circuitTier9 = "circuitNeutronic"; + static String circuitTier10 = "circuitQuantum"; + + //small gears + static String smallGearTier7 = "gearGtSmallChrome"; + static String smallGearTier8 = "gearGtSmallIridium"; + static String smallGearTier9 = "gearGtSmallOsmium"; + static String smallGearTier10 = "gearGtSmallNeutronium"; + + //Crafting Tools + static String craftingToolWrench = "craftingToolWrench"; + static String craftingToolScrewdriver = "craftingToolScrewdriver"; + + //Machine Components + static ItemStack electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1); + static ItemStack electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1); + static ItemStack electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1); + static ItemStack electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); + + static ItemStack electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1); + static ItemStack electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1); + static ItemStack electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1); + static ItemStack electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); + + static ItemStack electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1); + static ItemStack electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1); + static ItemStack electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1); + static ItemStack electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); + + static ItemStack robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1); + static ItemStack robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1); + static ItemStack robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1); + static ItemStack robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); + + static ItemStack conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1); + static ItemStack conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1); + static ItemStack conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1); + static ItemStack conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); + + static ItemStack emitter_LuV = GregtechItemList.Emitter_LuV.get(1); + static ItemStack emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1); + static ItemStack emitter_UV = GregtechItemList.Emitter_UV.get(1); + static ItemStack emitter_MAX = GregtechItemList.Emitter_MAX.get(1); + + static ItemStack fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1); + static ItemStack fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1); + static ItemStack fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1); + static ItemStack fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); + + static ItemStack sensor_LuV = GregtechItemList.Sensor_LuV.get(1); + static ItemStack sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1); + static ItemStack sensor_UV = GregtechItemList.Sensor_UV.get(1); + static ItemStack sensor_MAX = GregtechItemList.Sensor_MAX.get(1); + + public static final void RECIPES_LOAD(){ + run(); + Utils.LOG_INFO("Loading Recipes for the Various Circuits and their components."); + } + + private static void run(){ + //Electric Motors + UtilsRecipe.recipeBuilder( + cableTier7, wireTier7, rodTier7a, + wireTier7, rodTier7b, wireTier7, + rodTier7a, wireTier7, cableTier7, + electricMotor_LuV); + UtilsRecipe.recipeBuilder( + cableTier8, wireTier8, rodTier8a, + wireTier8, rodTier8b, wireTier8, + rodTier8a, wireTier8, cableTier8, + electricMotor_ZPM); + UtilsRecipe.recipeBuilder( + cableTier9, wireTier9, rodTier9a, + wireTier9, rodTier9b, wireTier9, + rodTier9a, wireTier9, cableTier9, + electricMotor_UV); + UtilsRecipe.recipeBuilder( + cableTier10, wireTier10, rodTier10a, + wireTier10, rodTier10b, wireTier10, + rodTier10a, wireTier10, cableTier10, + electricMotor_MAX); + + //Electric Pump + UtilsRecipe.recipeBuilder( + cableTier7, rotorTier7, itemRubberRing, + craftingToolScrewdriver, pipeTier7, craftingToolWrench, + itemRubberRing, electricMotor_LuV, cableTier7, + electricPump_LuV); + UtilsRecipe.recipeBuilder( + cableTier8, rotorTier8, itemRubberRing, + craftingToolScrewdriver, pipeTier8, craftingToolWrench, + itemRubberRing, electricMotor_ZPM, cableTier8, + electricPump_ZPM); + UtilsRecipe.recipeBuilder( + cableTier9, rotorTier9, itemRubberRing, + craftingToolScrewdriver, pipeTier9, craftingToolWrench, + itemRubberRing, electricMotor_UV, cableTier9, + electricPump_UV); + UtilsRecipe.recipeBuilder( + cableTier10, rotorTier10, itemRubberRing, + craftingToolScrewdriver, pipeTier10, craftingToolWrench, + itemRubberRing, electricMotor_MAX, cableTier10, + electricPump_MAX); + + //Electric Pump + UtilsRecipe.recipeBuilder( + plateTier7, plateTier7, plateTier7, + cableTier7, rodTier7a, rodTier7a, + cableTier7, electricMotor_LuV, smallGearTier7, + electricPiston_LuV); + UtilsRecipe.recipeBuilder( + plateTier8, plateTier8, plateTier8, + cableTier8, rodTier8a, rodTier8a, + cableTier8, electricMotor_ZPM, smallGearTier8, + electricPiston_ZPM); + UtilsRecipe.recipeBuilder( + plateTier9, plateTier9, plateTier9, + cableTier9, rodTier9a, rodTier9a, + cableTier9, electricMotor_UV, smallGearTier9, + electricPiston_UV); + UtilsRecipe.recipeBuilder( + plateTier10, plateTier10, plateTier10, + cableTier10, rodTier10a, rodTier10a, + cableTier10, electricMotor_MAX, smallGearTier10, + electricPiston_MAX); + + //Robot Arms + UtilsRecipe.recipeBuilder( + cableTier7, cableTier7, cableTier7, + electricMotor_LuV, rodTier7a, electricMotor_LuV, + electricPiston_LuV, circuitTier7, rodTier7a, + robotArm_LuV); + UtilsRecipe.recipeBuilder( + cableTier8, cableTier8, cableTier8, + electricMotor_ZPM, rodTier8a, electricMotor_ZPM, + electricPiston_ZPM, circuitTier8, rodTier8a, + robotArm_ZPM); + UtilsRecipe.recipeBuilder( + cableTier9, cableTier9, cableTier9, + electricMotor_UV, rodTier9a, electricMotor_UV, + electricPiston_UV, circuitTier9, rodTier9a, + robotArm_UV); + UtilsRecipe.recipeBuilder( + cableTier10, cableTier10, cableTier10, + electricMotor_MAX, rodTier10a, electricMotor_MAX, + electricPiston_MAX, circuitTier10, rodTier10a, + robotArm_MAX); + + //Conveyor Modules + UtilsRecipe.recipeBuilder( + plateRubber, plateRubber, plateRubber, + electricMotor_LuV, cableTier7, electricMotor_LuV, + plateRubber, plateRubber, plateRubber, + conveyorModule_LuV); + UtilsRecipe.recipeBuilder( + plateRubber, plateRubber, plateRubber, + electricMotor_ZPM, cableTier8, electricMotor_ZPM, + plateRubber, plateRubber, plateRubber, + conveyorModule_ZPM); + UtilsRecipe.recipeBuilder( + plateRubber, plateRubber, plateRubber, + electricMotor_UV, cableTier9, electricMotor_UV, + plateRubber, plateRubber, plateRubber, + conveyorModule_UV); + UtilsRecipe.recipeBuilder( + plateRubber, plateRubber, plateRubber, + electricMotor_MAX, cableTier10, electricMotor_MAX, + plateRubber, plateRubber, plateRubber, + conveyorModule_MAX); + + //Emitter Modules + UtilsRecipe.recipeBuilder( + rodTier7c, rodTier7c, circuitTier7, + cableTier7, circuitTier6, rodTier7c, + circuitTier7, cableTier7, rodTier7c, + emitter_LuV); + UtilsRecipe.recipeBuilder( + rodTier8c, rodTier8c, circuitTier8, + cableTier8, circuitTier7, rodTier8c, + circuitTier8, cableTier8, rodTier8c, + emitter_ZPM); + UtilsRecipe.recipeBuilder( + rodTier9c, rodTier9c, circuitTier9, + cableTier9, circuitTier8, rodTier9c, + circuitTier9, cableTier9, rodTier9c, + emitter_UV); + UtilsRecipe.recipeBuilder( + rodTier10c, rodTier10c, circuitTier10, + cableTier10, circuitTier9, rodTier10c, + circuitTier10, cableTier10, rodTier10c, + emitter_MAX); + + //Field Generator Modules + UtilsRecipe.recipeBuilder( + wireTier7, circuitTier7, wireTier7, + circuitTier7, circuitTier6, circuitTier7, + wireTier7, circuitTier7, wireTier7, + fieldGenerator_LuV); + UtilsRecipe.recipeBuilder( + wireTier8, circuitTier8, wireTier8, + circuitTier8, circuitTier7, circuitTier8, + wireTier8, circuitTier8, wireTier8, + fieldGenerator_ZPM); + UtilsRecipe.recipeBuilder( + wireTier9, circuitTier9, wireTier9, + circuitTier9, circuitTier8, circuitTier9, + wireTier9, circuitTier9, wireTier9, + fieldGenerator_UV); + UtilsRecipe.recipeBuilder( + wireTier10, circuitTier10, wireTier10, + circuitTier10, circuitTier9, circuitTier10, + wireTier10, circuitTier10, wireTier10, + fieldGenerator_MAX); + + //Sensor Modules + UtilsRecipe.recipeBuilder( + plateTier7, null, circuitTier6, + plateTier7, rodTier7c, null, + circuitTier7, plateTier7, plateTier7, + sensor_LuV); + UtilsRecipe.recipeBuilder( + plateTier8, null, circuitTier7, + plateTier8, rodTier8c, null, + circuitTier8, plateTier8, plateTier8, + sensor_ZPM); + UtilsRecipe.recipeBuilder( + plateTier9, null, circuitTier8, + plateTier9, rodTier9c, null, + circuitTier9, plateTier9, plateTier9, + sensor_UV); + UtilsRecipe.recipeBuilder( + plateTier10, null, circuitTier9, + plateTier10, rodTier10c, null, + circuitTier10, plateTier10, plateTier10, + sensor_MAX); + + Utils.LOG_INFO("Done loading recipes for the Various circuit content."); + GregtechMachinePhase(); + } + + private static void GregtechMachinePhase(){ + Utils.LOG_INFO("Adding Gregtech machine recipes for the components."); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_IV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), 32, 256); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_LuV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), 64, 512); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 2L), GregtechItemList.Circuit_Parts_Wiring_ZPM.get(4L, new Object[0]), GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), 96, 1024); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(3L, new Object[0]), GregtechItemList.Circuit_Parts_IV.get(1L, new Object[0]), 32, 512); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(3L, new Object[0]), GregtechItemList.Circuit_Parts_LuV.get(1L, new Object[0]), 64, 1024); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(3L, new Object[0]), GregtechItemList.Circuit_Parts_ZPM.get(1L, new Object[0]), 96, 2048); + GT_Values.RA.addForgeHammerRecipe(ItemList.Circuit_Master.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(5L, new Object[0]), 32, 256); + GT_Values.RA.addForgeHammerRecipe(GregtechItemList.Circuit_IV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(5L, new Object[0]), 64, 512); + GT_Values.RA.addForgeHammerRecipe(GregtechItemList.Circuit_LuV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(5L, new Object[0]), 128, 1024); + for (Materials tMat : Materials.VALUES) { + if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) { + int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; + GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_IV.get(1L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), GregtechItemList.Circuit_IV.get(1L, new Object[0]), 32, 512); + GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_LuV.get(1L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), GregtechItemList.Circuit_LuV.get(1L, new Object[0]), 64, 1024); + GT_Values.RA.addAssemblerRecipe(GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), GregtechItemList.Circuit_Parts_ZPM.get(1L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), GregtechItemList.Circuit_ZPM.get(1L, new Object[0]), 96, 2048); + + } + } + } +} |