diff options
14 files changed, 256 insertions, 164 deletions
diff --git a/build.gradle b/build.gradle index 9fe4fef4f4..6aa5cd6edf 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 archivesBaseName = "GT++" -version = "1.4.3.3-Experimental" +version = "1.4.3.4-Experimental" minecraft.version = "1.7.10-10.13.4.1448-1.7.10" task sourceJar(type: Jar) { diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index 547f15d8b5..46a577bf4b 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -13,6 +13,7 @@ import miscutil.core.handler.events.PickaxeBlockBreakEventHandler; import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; +import miscutil.core.recipe.RECIPE_CONSTANTS; import miscutil.core.tileentities.ModTileEntities; import miscutil.core.util.Utils; import miscutil.core.util.debug.DEBUG_INIT; @@ -82,6 +83,7 @@ public class CommonProxy { } ModItems.init(); ModBlocks.init(); + RECIPE_CONSTANTS.initialise(); MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler()); //Compat Handling diff --git a/src/Java/miscutil/core/creative/AddToCreativeTab.java b/src/Java/miscutil/core/creative/AddToCreativeTab.java index 7655a639ad..f71de821dc 100644 --- a/src/Java/miscutil/core/creative/AddToCreativeTab.java +++ b/src/Java/miscutil/core/creative/AddToCreativeTab.java @@ -3,7 +3,6 @@ package miscutil.core.creative; import miscutil.core.creative.tabs.MiscUtilCreativeTabBlock; import miscutil.core.creative.tabs.MiscUtilCreativeTabMachines; import miscutil.core.creative.tabs.MiscUtilCreativeTabMisc; -import miscutil.core.creative.tabs.MiscUtilCreativeTabOther; import miscutil.core.creative.tabs.MiscUtilCreativeTabTools; import miscutil.core.lib.CORE; import net.minecraft.creativetab.CreativeTabs; @@ -22,7 +21,7 @@ public class AddToCreativeTab { tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); - tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab"); + //tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab"); if (CORE.DEBUG){ //tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab"); diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index 64d8a0e1d4..8361be5a39 100644 --- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -42,7 +42,6 @@ import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; import miscutil.core.util.recipe.UtilsRecipe; -import miscutil.core.xmod.gregtech.common.items.MetaGeneratedGregtechItems; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -80,7 +79,6 @@ public class COMPAT_HANDLER { public static void registerGregtechMachines() { if (Gregtech) { - new MetaGeneratedGregtechItems(); new RECIPES_LaserEngraver(); GregtechEnergyBuffer.run(); GregtechConduits.run(); diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java index 1992a084c9..5b9058e2de 100644 --- a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java @@ -5,6 +5,7 @@ import miscutil.core.recipe.RECIPES_MachineComponents; import miscutil.core.recipe.RECIPES_Machines; import miscutil.core.recipe.RECIPES_Shapeless; import miscutil.core.recipe.RECIPES_Tools; +import miscutil.core.recipe.RECIPE_Batteries; import miscutil.core.util.Utils; public class RegistrationHandler { @@ -21,6 +22,7 @@ public class RegistrationHandler { RECIPES_Machines.RECIPES_LOAD(); RECIPES_Shapeless.RECIPES_LOAD(); RECIPES_MachineComponents.RECIPES_LOAD(); + RECIPE_Batteries.RECIPES_LOAD(); //RECIPES_MTWRAPPER.run(); Utils.LOG_INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed); COMPAT_HANDLER.areInitItemsLoaded = true; diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java index f2590f0282..f1a8620208 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java @@ -1,23 +1,12 @@ package miscutil.core.handler.registration.gregtech; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes; -import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator; -import net.minecraft.item.ItemStack; public class GregtechRocketFuelGenerator { - - static ItemStack INGREDIENT_1 = GregtechItemList.Electric_Piston_LuV.get(1); - static ItemStack INGREDIENT_2 = GregtechItemList.Electric_Motor_LuV.get(1); - public static void run() { if (LoadedMods.Gregtech){ @@ -31,11 +20,6 @@ public class GregtechRocketFuelGenerator { GregtechItemList.Rocket_Engine_EV.set(new GregtechMetaTileEntityRocketFuelGenerator(793, "advancedgenerator.rocketFuel.tier.01", "Basic Rocket Engine", 4).getStackForm(1L)); GregtechItemList.Rocket_Engine_IV.set(new GregtechMetaTileEntityRocketFuelGenerator(794, "advancedgenerator.rocketFuel.tier.02", "Advanced Rocket Engine", 5).getStackForm(1L)); GregtechItemList.Rocket_Engine_LuV.set(new GregtechMetaTileEntityRocketFuelGenerator(795, "advancedgenerator.rocketFuel.tier.03", "Turbo Rocket Engine", 6).getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'), ItemList.Electric_Piston_EV, Character.valueOf('E'), ItemList.Electric_Motor_EV, Character.valueOf('C'), GregtechOrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Aluminium), Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Titanium)}); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'), ItemList.Electric_Piston_IV, Character.valueOf('E'), ItemList.Electric_Motor_IV, Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic), Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.TungstenSteel)}); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'), INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2, Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Chrome)}); - } } diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index aefad98a0d..7cfea7fe6d 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -251,7 +251,7 @@ Gold Tool: 22*/ } - UtilsItems.generateSpawnEgg("ic2", "boatcarbon", Utils.generateSingularRandomHexValue(), Utils.generateSingularRandomHexValue()); + //UtilsItems.generateSpawnEgg("ic2", "boatcarbon", Utils.generateSingularRandomHexValue(), Utils.generateSingularRandomHexValue()); diff --git a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java index 9430efa20d..4fd5b1fa77 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java +++ b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java @@ -26,7 +26,7 @@ public class RECIPES_MachineComponents { 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"; @@ -100,50 +100,10 @@ public class RECIPES_MachineComponents { 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(){ + public static final void RECIPES_LOAD(){ + Utils.LOG_INFO("Loading Recipes for the Various Circuits and their components."); run(); - Utils.LOG_INFO("Loading Recipes for the Various Circuits and their components."); + GregtechMachinePhase(); } private static void run(){ @@ -152,181 +112,181 @@ public class RECIPES_MachineComponents { cableTier7, wireTier7, rodTier7a, wireTier7, rodTier7b, wireTier7, rodTier7a, wireTier7, cableTier7, - electricMotor_LuV); + RECIPE_CONSTANTS.electricMotor_LuV); UtilsRecipe.addShapedGregtechRecipe( cableTier8, wireTier8, rodTier8a, wireTier8, rodTier8b, wireTier8, rodTier8a, wireTier8, cableTier8, - electricMotor_ZPM); + RECIPE_CONSTANTS.electricMotor_ZPM); UtilsRecipe.addShapedGregtechRecipe( cableTier9, wireTier9, rodTier9a, wireTier9, rodTier9b, wireTier9, rodTier9a, wireTier9, cableTier9, - electricMotor_UV); + RECIPE_CONSTANTS.electricMotor_UV); UtilsRecipe.addShapedGregtechRecipe( cableTier10, wireTier10, rodTier10a, wireTier10, rodTier10b, wireTier10, rodTier10a, wireTier10, cableTier10, - electricMotor_MAX); + RECIPE_CONSTANTS.electricMotor_MAX); //Electric Pump UtilsRecipe.addShapedGregtechRecipe( cableTier7, rotorTier7, itemRubberRing, craftingToolScrewdriver, pipeTier7, craftingToolWrench, - itemRubberRing, electricMotor_LuV, cableTier7, - electricPump_LuV); + itemRubberRing, RECIPE_CONSTANTS.electricMotor_LuV, cableTier7, + RECIPE_CONSTANTS.electricPump_LuV); UtilsRecipe.addShapedGregtechRecipe( cableTier8, rotorTier8, itemRubberRing, craftingToolScrewdriver, pipeTier8, craftingToolWrench, - itemRubberRing, electricMotor_ZPM, cableTier8, - electricPump_ZPM); + itemRubberRing, RECIPE_CONSTANTS.electricMotor_ZPM, cableTier8, + RECIPE_CONSTANTS.electricPump_ZPM); UtilsRecipe.addShapedGregtechRecipe( cableTier9, rotorTier9, itemRubberRing, craftingToolScrewdriver, pipeTier9, craftingToolWrench, - itemRubberRing, electricMotor_UV, cableTier9, - electricPump_UV); + itemRubberRing, RECIPE_CONSTANTS.electricMotor_UV, cableTier9, + RECIPE_CONSTANTS.electricPump_UV); UtilsRecipe.addShapedGregtechRecipe( cableTier10, rotorTier10, itemRubberRing, craftingToolScrewdriver, pipeTier10, craftingToolWrench, - itemRubberRing, electricMotor_MAX, cableTier10, - electricPump_MAX); + itemRubberRing, RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, + RECIPE_CONSTANTS.electricPump_MAX); //Electric Pump UtilsRecipe.addShapedGregtechRecipe( plateTier7, plateTier7, plateTier7, cableTier7, rodTier7a, rodTier7a, - cableTier7, electricMotor_LuV, smallGearTier7, - electricPiston_LuV); + cableTier7, RECIPE_CONSTANTS.electricMotor_LuV, smallGearTier7, + RECIPE_CONSTANTS.electricPiston_LuV); UtilsRecipe.addShapedGregtechRecipe( plateTier8, plateTier8, plateTier8, cableTier8, rodTier8a, rodTier8a, - cableTier8, electricMotor_ZPM, smallGearTier8, - electricPiston_ZPM); + cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM, smallGearTier8, + RECIPE_CONSTANTS.electricPiston_ZPM); UtilsRecipe.addShapedGregtechRecipe( plateTier9, plateTier9, plateTier9, cableTier9, rodTier9a, rodTier9a, - cableTier9, electricMotor_UV, smallGearTier9, - electricPiston_UV); + cableTier9, RECIPE_CONSTANTS.electricMotor_UV, smallGearTier9, + RECIPE_CONSTANTS.electricPiston_UV); UtilsRecipe.addShapedGregtechRecipe( plateTier10, plateTier10, plateTier10, cableTier10, rodTier10a, rodTier10a, - cableTier10, electricMotor_MAX, smallGearTier10, - electricPiston_MAX); + cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, smallGearTier10, + RECIPE_CONSTANTS.electricPiston_MAX); //Robot Arms UtilsRecipe.addShapedGregtechRecipe( cableTier7, cableTier7, cableTier7, - electricMotor_LuV, rodTier7a, electricMotor_LuV, - electricPiston_LuV, circuitTier7, rodTier7a, - robotArm_LuV); + RECIPE_CONSTANTS.electricMotor_LuV, rodTier7a, RECIPE_CONSTANTS.electricMotor_LuV, + RECIPE_CONSTANTS.electricPiston_LuV, circuitTier7, rodTier7a, + RECIPE_CONSTANTS.robotArm_LuV); UtilsRecipe.addShapedGregtechRecipe( cableTier8, cableTier8, cableTier8, - electricMotor_ZPM, rodTier8a, electricMotor_ZPM, - electricPiston_ZPM, circuitTier8, rodTier8a, - robotArm_ZPM); + RECIPE_CONSTANTS.electricMotor_ZPM, rodTier8a, RECIPE_CONSTANTS.electricMotor_ZPM, + RECIPE_CONSTANTS.electricPiston_ZPM, circuitTier8, rodTier8a, + RECIPE_CONSTANTS.robotArm_ZPM); UtilsRecipe.addShapedGregtechRecipe( cableTier9, cableTier9, cableTier9, - electricMotor_UV, rodTier9a, electricMotor_UV, - electricPiston_UV, circuitTier9, rodTier9a, - robotArm_UV); + RECIPE_CONSTANTS.electricMotor_UV, rodTier9a, RECIPE_CONSTANTS.electricMotor_UV, + RECIPE_CONSTANTS.electricPiston_UV, circuitTier9, rodTier9a, + RECIPE_CONSTANTS.robotArm_UV); UtilsRecipe.addShapedGregtechRecipe( cableTier10, cableTier10, cableTier10, - electricMotor_MAX, rodTier10a, electricMotor_MAX, - electricPiston_MAX, circuitTier10, rodTier10a, - robotArm_MAX); + RECIPE_CONSTANTS.electricMotor_MAX, rodTier10a, RECIPE_CONSTANTS.electricMotor_MAX, + RECIPE_CONSTANTS.electricPiston_MAX, circuitTier10, rodTier10a, + RECIPE_CONSTANTS.robotArm_MAX); //Conveyor Modules UtilsRecipe.addShapedGregtechRecipe( plateRubber, plateRubber, plateRubber, - electricMotor_LuV, cableTier7, electricMotor_LuV, + RECIPE_CONSTANTS.electricMotor_LuV, cableTier7, RECIPE_CONSTANTS.electricMotor_LuV, plateRubber, plateRubber, plateRubber, - conveyorModule_LuV); + RECIPE_CONSTANTS.conveyorModule_LuV); UtilsRecipe.addShapedGregtechRecipe( plateRubber, plateRubber, plateRubber, - electricMotor_ZPM, cableTier8, electricMotor_ZPM, + RECIPE_CONSTANTS.electricMotor_ZPM, cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM, plateRubber, plateRubber, plateRubber, - conveyorModule_ZPM); + RECIPE_CONSTANTS.conveyorModule_ZPM); UtilsRecipe.addShapedGregtechRecipe( plateRubber, plateRubber, plateRubber, - electricMotor_UV, cableTier9, electricMotor_UV, + RECIPE_CONSTANTS.electricMotor_UV, cableTier9, RECIPE_CONSTANTS.electricMotor_UV, plateRubber, plateRubber, plateRubber, - conveyorModule_UV); + RECIPE_CONSTANTS.conveyorModule_UV); UtilsRecipe.addShapedGregtechRecipe( plateRubber, plateRubber, plateRubber, - electricMotor_MAX, cableTier10, electricMotor_MAX, + RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, plateRubber, plateRubber, plateRubber, - conveyorModule_MAX); + RECIPE_CONSTANTS.conveyorModule_MAX); //Emitter Modules UtilsRecipe.addShapedGregtechRecipe( rodTier7c, rodTier7c, circuitTier7, cableTier7, circuitTier6, rodTier7c, circuitTier7, cableTier7, rodTier7c, - emitter_LuV); + RECIPE_CONSTANTS.emitter_LuV); UtilsRecipe.addShapedGregtechRecipe( rodTier8c, rodTier8c, circuitTier8, cableTier8, circuitTier7, rodTier8c, circuitTier8, cableTier8, rodTier8c, - emitter_ZPM); + RECIPE_CONSTANTS.emitter_ZPM); UtilsRecipe.addShapedGregtechRecipe( rodTier9c, rodTier9c, circuitTier9, cableTier9, circuitTier8, rodTier9c, circuitTier9, cableTier9, rodTier9c, - emitter_UV); + RECIPE_CONSTANTS.emitter_UV); UtilsRecipe.addShapedGregtechRecipe( rodTier10c, rodTier10c, circuitTier10, cableTier10, circuitTier9, rodTier10c, circuitTier10, cableTier10, rodTier10c, - emitter_MAX); + RECIPE_CONSTANTS.emitter_MAX); //Field Generator Modules UtilsRecipe.addShapedGregtechRecipe( wireTier7, circuitTier7, wireTier7, circuitTier7, circuitTier6, circuitTier7, wireTier7, circuitTier7, wireTier7, - fieldGenerator_LuV); + RECIPE_CONSTANTS.fieldGenerator_LuV); UtilsRecipe.addShapedGregtechRecipe( wireTier8, circuitTier8, wireTier8, circuitTier8, circuitTier7, circuitTier8, wireTier8, circuitTier8, wireTier8, - fieldGenerator_ZPM); + RECIPE_CONSTANTS.fieldGenerator_ZPM); UtilsRecipe.addShapedGregtechRecipe( wireTier9, circuitTier9, wireTier9, circuitTier9, circuitTier8, circuitTier9, wireTier9, circuitTier9, wireTier9, - fieldGenerator_UV); + RECIPE_CONSTANTS.fieldGenerator_UV); UtilsRecipe.addShapedGregtechRecipe( wireTier10, circuitTier10, wireTier10, circuitTier10, circuitTier9, circuitTier10, wireTier10, circuitTier10, wireTier10, - fieldGenerator_MAX); + RECIPE_CONSTANTS.fieldGenerator_MAX); //Sensor Modules UtilsRecipe.addShapedGregtechRecipe( plateTier7, null, circuitTier6, plateTier7, rodTier7c, null, circuitTier7, plateTier7, plateTier7, - sensor_LuV); + RECIPE_CONSTANTS.sensor_LuV); UtilsRecipe.addShapedGregtechRecipe( plateTier8, null, circuitTier7, plateTier8, rodTier8c, null, circuitTier8, plateTier8, plateTier8, - sensor_ZPM); + RECIPE_CONSTANTS.sensor_ZPM); UtilsRecipe.addShapedGregtechRecipe( plateTier9, null, circuitTier8, plateTier9, rodTier9c, null, circuitTier9, plateTier9, plateTier9, - sensor_UV); + RECIPE_CONSTANTS.sensor_UV); UtilsRecipe.addShapedGregtechRecipe( plateTier10, null, circuitTier9, plateTier10, rodTier10c, null, circuitTier10, plateTier10, plateTier10, - sensor_MAX); + RECIPE_CONSTANTS.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); @@ -344,7 +304,7 @@ public class RECIPES_MachineComponents { 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); - + } } } diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java index 739df0dcea..70aa5a52a2 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java @@ -1,11 +1,15 @@ package miscutil.core.recipe; import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; import miscutil.core.util.recipe.UtilsRecipe; import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes; +import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import net.minecraft.item.ItemStack; public class RECIPES_Machines { @@ -309,8 +313,8 @@ public class RECIPES_Machines { sensor_HV = ItemList.Sensor_HV.get(1); sensor_EV = ItemList.Sensor_EV.get(1); sensor_IV = ItemList.Sensor_IV.get(1); - - + + //IV MACHINES IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); IV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1); @@ -318,8 +322,8 @@ public class RECIPES_Machines { IV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1); IV_MACHINE_MassFabricator= ItemList.Machine_IV_Massfab.get(1); IV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1); - - + + } if(LoadedMods.Railcraft){ @@ -341,6 +345,22 @@ public class RECIPES_Machines { "dustUranium", "dustUranium", "dustUranium", RECIPES_Shapeless.dustStaballoy); + UtilsRecipe.addShapedGregtechRecipe( + ItemList.Electric_Piston_EV, GregtechOrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV, + ItemList.Electric_Motor_EV, ItemList.Hull_EV, ItemList.Electric_Motor_EV, + OrePrefixes.gearGt.get(Materials.Titanium), OrePrefixes.cableGt02.get(Materials.Aluminium), OrePrefixes.gearGt.get(Materials.Titanium), + GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0])); + UtilsRecipe.addShapedGregtechRecipe( + ItemList.Electric_Piston_IV, GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic), ItemList.Electric_Piston_IV, + ItemList.Electric_Motor_IV, ItemList.Hull_IV, ItemList.Electric_Motor_IV, + OrePrefixes.gearGt.get(Materials.TungstenSteel), OrePrefixes.cableGt02.get(Materials.Platinum), OrePrefixes.gearGt.get(Materials.TungstenSteel), + GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0])); + UtilsRecipe.addShapedGregtechRecipe( + RECIPE_CONSTANTS.electricPiston_LuV, GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), RECIPE_CONSTANTS.electricPiston_LuV, + RECIPE_CONSTANTS.electricMotor_LuV, ItemList.Hull_LuV, RECIPE_CONSTANTS.electricMotor_LuV, + OrePrefixes.gearGt.get(Materials.Chrome), OrePrefixes.cableGt02.get(Materials.Tungsten), OrePrefixes.gearGt.get(Materials.Chrome), + GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0])); + //Buffer Core UtilsRecipe.addShapedGregtechRecipe( plateTier1, cableTier1, plateTier1, diff --git a/src/Java/miscutil/core/recipe/RECIPE_Batteries.java b/src/Java/miscutil/core/recipe/RECIPE_Batteries.java new file mode 100644 index 0000000000..9764e4d590 --- /dev/null +++ b/src/Java/miscutil/core/recipe/RECIPE_Batteries.java @@ -0,0 +1,49 @@ +package miscutil.core.recipe; + +import gregtech.api.enums.ItemList; +import miscutil.core.lib.LoadedMods; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; +import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import net.minecraft.item.ItemStack; + +public class RECIPE_Batteries { + + static ItemStack RECIPE_Battery_Sodium = GregtechItemList.Battery_RE_EV_Sodium.get(1); + static ItemStack RECIPE_Battery_Cadmium = GregtechItemList.Battery_RE_EV_Cadmium.get(1); + static ItemStack RECIPE_Battery_Lithium = GregtechItemList.Battery_RE_EV_Lithium.get(1); + static ItemStack GT_Battery_Sodium = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32539, 1); + static ItemStack GT_Battery_Cadmium = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32537, 1); + static ItemStack GT_Battery_Lithium = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32538, 1); + static ItemStack machineTransformer_EV; + + public static void RECIPES_LOAD(){ + + if (LoadedMods.Gregtech){ + machineTransformer_EV = ItemList.Transformer_EV_HV.get(1); + run(); + } + } + + private static void run(){ + + + UtilsRecipe.addShapedGregtechRecipe( + GT_Battery_Sodium, RECIPES_Machines.cableTier4, GT_Battery_Sodium, + RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, + GT_Battery_Sodium, RECIPES_Machines.cableTier4, GT_Battery_Sodium, + RECIPE_Battery_Sodium); + UtilsRecipe.addShapedGregtechRecipe( + GT_Battery_Cadmium, RECIPES_Machines.cableTier4, GT_Battery_Cadmium, + RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, + GT_Battery_Cadmium, RECIPES_Machines.cableTier4, GT_Battery_Cadmium, + RECIPE_Battery_Cadmium); + UtilsRecipe.addShapedGregtechRecipe( + GT_Battery_Lithium, RECIPES_Machines.cableTier4, GT_Battery_Lithium, + RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, + GT_Battery_Lithium, RECIPES_Machines.cableTier4, GT_Battery_Lithium, + RECIPE_Battery_Lithium); + + } + +} diff --git a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java b/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java new file mode 100644 index 0000000000..f5e180fccd --- /dev/null +++ b/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java @@ -0,0 +1,86 @@ +package miscutil.core.recipe; + +import miscutil.core.lib.CORE; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import net.minecraft.item.ItemStack; + +public class RECIPE_CONSTANTS { + + //Machine Components + public static ItemStack electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1); + public static ItemStack electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1); + public static ItemStack electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1); + public static ItemStack electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); + public static ItemStack electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1); + public static ItemStack electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1); + public static ItemStack electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1); + public static ItemStack electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); + public static ItemStack electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1); + public static ItemStack electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1); + public static ItemStack electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1); + public static ItemStack electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); + public static ItemStack robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1); + public static ItemStack robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1); + public static ItemStack robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1); + public static ItemStack robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); + public static ItemStack conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1); + public static ItemStack conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1); + public static ItemStack conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1); + public static ItemStack conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); + public static ItemStack emitter_LuV = GregtechItemList.Emitter_LuV.get(1); + public static ItemStack emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1); + public static ItemStack emitter_UV = GregtechItemList.Emitter_UV.get(1); + public static ItemStack emitter_MAX = GregtechItemList.Emitter_MAX.get(1); + public static ItemStack fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1); + public static ItemStack fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1); + public static ItemStack fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1); + public static ItemStack fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); + public static ItemStack sensor_LuV = GregtechItemList.Sensor_LuV.get(1); + public static ItemStack sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1); + public static ItemStack sensor_UV = GregtechItemList.Sensor_UV.get(1); + public static ItemStack sensor_MAX = GregtechItemList.Sensor_MAX.get(1); + + public static void initialise(){ + if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ + registerGTExperimentalComponents(); + } + } + + private static void registerGTExperimentalComponents(){ + //Outputs + //Machine Components + electricMotor_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1); + electricMotor_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1); + electricMotor_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1); + + electricPump_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1); + electricPump_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1); + electricPump_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1); + + electricPiston_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1); + electricPiston_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1); + electricPiston_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1); + + robotArm_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1); + robotArm_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1); + robotArm_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1); + + conveyorModule_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1); + conveyorModule_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1); + conveyorModule_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1); + + emitter_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1); + emitter_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1); + emitter_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1); + + fieldGenerator_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1); + fieldGenerator_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1); + fieldGenerator_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1); + + sensor_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); + sensor_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); + sensor_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); + } + +} diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java index 0e49521ccc..026e86ef48 100644 --- a/src/Java/miscutil/core/util/Utils.java +++ b/src/Java/miscutil/core/util/Utils.java @@ -371,10 +371,10 @@ public class Utils { Color c = new Color(r,g,b); String temp = Integer.toHexString( c.getRGB() & 0xFFFFFF ).toUpperCase(); - System.out.println( "hex: " + Integer.toHexString( c.getRGB() & 0xFFFFFF ) + " hex value:"+temp); + //System.out.println( "hex: " + Integer.toHexString( c.getRGB() & 0xFFFFFF ) + " hex value:"+temp); temp = Utils.appenedHexNotationToString(String.valueOf(temp)); - Utils.LOG_INFO("Made "+temp+" - Hopefully it's not a mess."); - Utils.LOG_INFO("It will decode into "+Integer.decode(temp)+"."); + Utils.LOG_WARNING("Made "+temp+" - Hopefully it's not a mess."); + Utils.LOG_WARNING("It will decode into "+Integer.decode(temp)+"."); return Integer.decode(temp); } @@ -474,10 +474,10 @@ public class Utils { temp = "0F0F0F"; } - Utils.LOG_INFO("Operating with "+temp); + Utils.LOG_WARNING("Operating with "+temp); temp = Utils.appenedHexNotationToString(String.valueOf(temp)); - Utils.LOG_INFO("Made "+temp+" - Hopefully it's not a mess."); - Utils.LOG_INFO("It will decode into "+Integer.decode(temp)+"."); + Utils.LOG_WARNING("Made "+temp+" - Hopefully it's not a mess."); + Utils.LOG_WARNING("It will decode into "+Integer.decode(temp)+"."); return Integer.decode(temp); } diff --git a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java index 9ff608eca5..47bbc0aa81 100644 --- a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java @@ -3,6 +3,7 @@ package miscutil.core.xmod.gregtech; import gregtech.api.util.GT_Config; import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler; +import miscutil.core.xmod.gregtech.common.items.MetaGeneratedGregtechItems; public class HANDLER_GT { @@ -12,6 +13,7 @@ public class HANDLER_GT { if (mMaterialProperties != null){ GT_Materials.init(mMaterialProperties); GregtechFluidHandler.run(); + new MetaGeneratedGregtechItems(); //new MetaGeneratedGregtechTools(); //new Processing_Ingot1(); //new Processing_Plate1(); diff --git a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 6831c56db2..acb317401d 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -11,6 +11,8 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.common.covers.GT_Cover_Arm; import gregtech.common.covers.GT_Cover_Conveyor; import gregtech.common.covers.GT_Cover_Pump; +import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes; import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; @@ -23,6 +25,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { super("MU-metaitem.01", new OrePrefixes[]{null}); INSTANCE = this; int tLastID = 0; + + if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ + Utils.LOG_INFO("Gregtech 5.09 not found, using fallback components. (I like how I have to add compat to something I added first and had stolen."); GregtechItemList.Electric_Pump_LuV.set(addItem(tLastID = 0, "Electric Pump (LuV)", "163920 L/sec (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L)})); GregtechItemList.Electric_Pump_ZPM.set(addItem(tLastID = 1, "Electric Pump (ZPM)", "655680 L/sec (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)})); GregtechItemList.Electric_Pump_UV.set(addItem(tLastID = 2, "Electric Pump (UV)", "2622720 L/sec (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L)})); @@ -107,10 +112,26 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { //GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_ZPM.get(1L, new Object[0]), //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'), OrePrefixes.gem.get(Materials.NetherQuartz), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Electrum), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Aluminium), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good)}); //GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_UV.get(1L, new Object[0]), //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'), OrePrefixes.gem.get(Materials.Emerald), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Chrome), Character.valueOf('P'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced)}); //GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_MAX.get(1L, new Object[0]), //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'), OrePrefixes.gem.get(Materials.EnderPearl), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Platinum), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Elite)}); - + + } - + GregtechItemList.Circuit_IV.set(addItem(tLastID = 704, "Symbiotic Circuit (IV)", "A Symbiotic Data Processor", new Object[]{GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic)})); + GregtechItemList.Circuit_LuV.set(addItem(tLastID = 705, "Neutronic Circuit (LuV)", "A Neutron Particle Processor", new Object[]{OrePrefixes.circuit.get(GT_Materials.Neutronic)})); + GregtechItemList.Circuit_ZPM.set(addItem(tLastID = 706, "Quantum Circuit (ZPM)", "A Singlularity Processor", new Object[]{OrePrefixes.circuit.get(GT_Materials.Quantum)})); + GregtechItemList.Circuit_Board_IV.set(addItem(tLastID = 710, "IV Circuit Board", "An IV Voltage Rated Circuit Board", new Object[0])); + GregtechItemList.Circuit_Board_LuV.set(addItem(tLastID = 711, "LuV Circuit Board", "An LuV Voltage Rated Circuit Board", new Object[0])); + GregtechItemList.Circuit_Board_ZPM.set(addItem(tLastID = 712, "ZPM Processor Board", "A ZPM Voltage Rated Processor Board", new Object[0])); + GregtechItemList.Circuit_Parts_Crystal_Chip_IV.set(addItem(tLastID = 713, "(IV) Energized Crystal Chip", "Needed for Circuits", new Object[0])); + GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.set(addItem(tLastID = 714, "(LuV) Neutron based Microchip", "Needed for Circuits", new Object[0])); + GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.set(addItem(tLastID = 715, "(ZPM) Quantum Chip", "Needed for Circuits", new Object[0])); + GregtechItemList.Circuit_Parts_IV.set(addItem(tLastID = 716, "(IV) Energized Circuit Parts", "Circuit Parts", new Object[0])); + GregtechItemList.Circuit_Parts_LuV.set(addItem(tLastID = 717, "(LuV) Neutron-based Circuit Parts", "Circuit Parts", new Object[0])); + GregtechItemList.Circuit_Parts_ZPM.set(addItem(tLastID = 718, "(ZPM) Quantum Circuit Parts", "Circuit Parts", new Object[0])); + GregtechItemList.Circuit_Parts_Wiring_IV.set(addItem(tLastID = 719, "Etched IV Voltage Wiring", "Part of Circuit Boards", new Object[0])); + GregtechItemList.Circuit_Parts_Wiring_LuV.set(addItem(tLastID = 720, "Etched LuV Voltage Wiring", "Part of Circuit Boards", new Object[0])); + GregtechItemList.Circuit_Parts_Wiring_ZPM.set(addItem(tLastID = 721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards", new Object[0])); + //Extruder Shape @@ -133,36 +154,5 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Mercury Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true);*/ - - - - - - - - - - - GregtechItemList.Circuit_IV.set(addItem(tLastID = 704, "Symbiotic Circuit (IV)", "A Symbiotic Data Processor", new Object[]{GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic)})); - GregtechItemList.Circuit_LuV.set(addItem(tLastID = 705, "Neutronic Circuit (LuV)", "A Neutron Particle Processor", new Object[]{OrePrefixes.circuit.get(GT_Materials.Neutronic)})); - GregtechItemList.Circuit_ZPM.set(addItem(tLastID = 706, "Quantum Circuit (ZPM)", "A Singlularity Processor", new Object[]{OrePrefixes.circuit.get(GT_Materials.Quantum)})); - GregtechItemList.Circuit_Board_IV.set(addItem(tLastID = 710, "IV Circuit Board", "An IV Voltage Rated Circuit Board", new Object[0])); - GregtechItemList.Circuit_Board_LuV.set(addItem(tLastID = 711, "LuV Circuit Board", "An LuV Voltage Rated Circuit Board", new Object[0])); - GregtechItemList.Circuit_Board_ZPM.set(addItem(tLastID = 712, "ZPM Processor Board", "A ZPM Voltage Rated Processor Board", new Object[0])); - GregtechItemList.Circuit_Parts_Crystal_Chip_IV.set(addItem(tLastID = 713, "(IV) Energized Crystal Chip", "Needed for Circuits", new Object[0])); - GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.set(addItem(tLastID = 714, "(LuV) Neutron based Microchip", "Needed for Circuits", new Object[0])); - GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.set(addItem(tLastID = 715, "(ZPM) Quantum Chip", "Needed for Circuits", new Object[0])); - GregtechItemList.Circuit_Parts_IV.set(addItem(tLastID = 716, "(IV) Energized Circuit Parts", "Circuit Parts", new Object[0])); - GregtechItemList.Circuit_Parts_LuV.set(addItem(tLastID = 717, "(LuV) Neutron-based Circuit Parts", "Circuit Parts", new Object[0])); - GregtechItemList.Circuit_Parts_ZPM.set(addItem(tLastID = 718, "(ZPM) Quantum Circuit Parts", "Circuit Parts", new Object[0])); - GregtechItemList.Circuit_Parts_Wiring_IV.set(addItem(tLastID = 719, "Etched IV Voltage Wiring", "Part of Circuit Boards", new Object[0])); - GregtechItemList.Circuit_Parts_Wiring_LuV.set(addItem(tLastID = 720, "Etched LuV Voltage Wiring", "Part of Circuit Boards", new Object[0])); - GregtechItemList.Circuit_Parts_Wiring_ZPM.set(addItem(tLastID = 721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards", new Object[0])); - - - - - - } } |