diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
5 files changed, 127 insertions, 76 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 757b7ac45d..8fd5635e31 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -418,6 +418,18 @@ public class RECIPES_GREGTECH { } private static void assemblerRecipes(){ + //Wire Coils + ItemStack coil1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil", "coil1", 0, 1); + ItemStack coil2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:1", "coil2", 1, 1); + ItemStack coil3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:2", "coil3", 2, 1); + ItemStack coil4 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:3", "coil4", 3, 1); + + GT_Values.RA.addAssemblerRecipe(ItemUtils.getGregtechCircuit(22), ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 4), coil1, 50, 16); + GT_Values.RA.addAssemblerRecipe(ItemUtils.getGregtechCircuit(22), ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 4), coil2, 50, 16); + GT_Values.RA.addAssemblerRecipe(ItemUtils.getGregtechCircuit(22), ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 4), coil3, 50, 16); + GT_Values.RA.addAssemblerRecipe(ItemUtils.getGregtechCircuit(22), ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 4), coil4, 50, 16); + + //GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6L), ItemList.Casing_Turbine.get(1L, new Object[0]), ItemList.Casing_Turbine2.get(1L, new Object[0]), 50, 16); //GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6L), ItemList.Casing_Turbine.get(1L, new Object[0]), ItemList.Casing_Turbine3.get(1L, new Object[0]), 50, 16); @@ -488,7 +500,7 @@ public class RECIPES_GREGTECH { GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Cadmium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Lithium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); } - + private static void fluidExtractorRecipes(){ GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(Items.ender_pearl), null, FluidUtils.getFluidStack("ender", 250), 10000, 100, 30); } @@ -539,7 +551,7 @@ public class RECIPES_GREGTECH { GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144*3), null, 3000, 500); //GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 720), FluidUtils.getFluidStack("molten.uraniumhexafluoride", 288), null, 5000, 2000); GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 20), ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), null, null, ItemUtils.getItemStackOfAmountFromOreDict("dustEglinSteel", 30), 1200, 60); - } + } private static void chemicalReactorRecipes(){ GT_Values.RA.addChemicalRecipe( @@ -615,7 +627,7 @@ public class RECIPES_GREGTECH { 120*20, 30); } - + private static void compressorRecipes(){ GT_ModHandler.addCompressionRecipe(ItemUtils.getSimpleStack(Items.clay_ball), ItemUtils.getItemStackOfAmountFromOreDict("plateClay", 1)); } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java index c3726dbddc..9381cdeb4e 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java @@ -77,5 +77,43 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { } } + + else if (aOreDictName.equals(OreDictNames.craftingLensLime.toString())) { + //Coil Wires + ItemStack coilWire1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 1); + ItemStack coilWire2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 1); + ItemStack coilWire3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 1); + ItemStack coilWire4 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 1); + + //Simple Life + String wire = "wireGt02"; + + //Wires to Laser + ItemStack wireT1a = ItemUtils.getItemStackOfAmountFromOreDict(wire+"Aluminium", 1); + ItemStack wireT1b = ItemUtils.getItemStackOfAmountFromOreDict(wire+"Nichrome", 1); + ItemStack wireT2a = ItemUtils.getItemStackOfAmountFromOreDict(wire+"Osmium", 1); + ItemStack wireT2b = ItemUtils.getItemStackOfAmountFromOreDict(wire+"Platinum", 1); + ItemStack wireT3a = ItemUtils.getItemStackOfAmountFromOreDict(wire+"VanadiumGallium", 1); + ItemStack wireT3b = ItemUtils.getItemStackOfAmountFromOreDict(wire+"YttriumBariumCuprate", 1); + ItemStack wireT3c = ItemUtils.getItemStackOfAmountFromOreDict(wire+"NiobiumTitanium", 1); + ItemStack wireT4a = ItemUtils.getItemStackOfAmountFromOreDict(wire+"Naquadah", 1); + + //T1 + GT_Values.RA.addLaserEngraverRecipe(wireT1a, GT_Utility.copyAmount(0L, new Object[]{aStack}), coilWire1, 10*20, 500); + GT_Values.RA.addLaserEngraverRecipe(wireT1b, GT_Utility.copyAmount(0L, new Object[]{aStack}), coilWire1, 10*20, 500); + //T2 + GT_Values.RA.addLaserEngraverRecipe(wireT2a, GT_Utility.copyAmount(0L, new Object[]{aStack}), coilWire2, 20*20, 2000); + GT_Values.RA.addLaserEngraverRecipe(wireT2b, GT_Utility.copyAmount(0L, new Object[]{aStack}), coilWire2, 20*20, 2000); + //T3 + GT_Values.RA.addLaserEngraverRecipe(wireT3a, GT_Utility.copyAmount(0L, new Object[]{aStack}), coilWire3, 30*20, 8000); + GT_Values.RA.addLaserEngraverRecipe(wireT3b, GT_Utility.copyAmount(0L, new Object[]{aStack}), coilWire3, 30*20, 8000); + GT_Values.RA.addLaserEngraverRecipe(wireT3c, GT_Utility.copyAmount(0L, new Object[]{aStack}), coilWire3, 30*20, 8000); + //T4 + GT_Values.RA.addLaserEngraverRecipe(wireT4a, GT_Utility.copyAmount(0L, new Object[]{aStack}), coilWire4, 40*20, 32000); + + + } + + } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index 17abf3f06e..b930fa7c10 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java @@ -10,91 +10,91 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class RECIPES_MachineComponents { //Wire - static String wireTier0 = "wireGt01Lead"; - static String wireTier1 = "wireGt01RedAlloy"; - static String wireTier6 = "wireGt08NiobiumTitanium"; - static String wireTier7 = "wireGt08Osmium"; - static String wireTier8 = "wireGt08Naquadah"; - static String wireTier9 = "wireGt08Superconductor"; - static String wireTier10 = "wireGt16Superconductor"; + public static String wireTier0 = "wireGt01Lead"; + public static String wireTier1 = "wireGt01RedAlloy"; + public static String wireTier6 = "wireGt08NiobiumTitanium"; + public static String wireTier7 = "wireGt08Osmium"; + public static String wireTier8 = "wireGt08Naquadah"; + public static String wireTier9 = "wireGt08Superconductor"; + public static String wireTier10 = "wireGt16Superconductor"; //Cable - static String cableTier0 = "cableGt01Lead"; - static String cableTier1 = "cableGt01RedAlloy"; - static String cableTier6 = "cableGt04Tungsten"; - static String cableTier7 = "cableGt04NiobiumTitanium"; - static String cableTier8 = "cableGt04Osmium"; - static String cableTier9 = "cableGt04Naquadah"; - static String cableTier10 = "wireGt08Superconductor"; + public static String cableTier0 = "cableGt01Lead"; + public static String cableTier1 = "cableGt01RedAlloy"; + public static String cableTier6 = "cableGt04Tungsten"; + public static String cableTier7 = "cableGt04NiobiumTitanium"; + public static String cableTier8 = "cableGt04Osmium"; + public static String cableTier9 = "cableGt04Naquadah"; + public static String cableTier10 = "wireGt08Superconductor"; //Plates - static String plateTier0 = "plateWroughtIron"; - static String plateTier7 = "plateChrome"; - static String plateTier8 = "plateIridium"; - static String plateTier9 = "plateOsmium"; - static String plateTier10 = "plateNeutronium"; + public static String plateTier0 = "plateWroughtIron"; + public static String plateTier7 = "plateChrome"; + public static String plateTier8 = "plateIridium"; + public static String plateTier9 = "plateOsmium"; + public static String plateTier10 = "plateNeutronium"; //rods - static String rodTier0 = "stickWroughtIron"; - static String rodTier1 = "stickPotin"; - static String rodTier2 = "stickIronMagnetic"; - 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"; + public static String rodTier0 = "stickWroughtIron"; + public static String rodTier1 = "stickPotin"; + public static String rodTier2 = "stickIronMagnetic"; + public static String rodTier7a = "stickChrome"; + public static String rodTier8a = "stickIridium"; + public static String rodTier9a = "stickOsmium"; + public static String rodTier10a = "stickNeutronium"; + public static String rodTier7b = "stickPlatinum"; + public static String rodTier8b = "stickChrome"; + public static String rodTier9b = "stickIridium"; + public static String rodTier10b = "stickOsmium"; + public static String rodTier7c = "stickTitanium"; + public static String rodTier8c = "stickTungstenSteel"; + public static String rodTier9c = "stickNaquadah"; + public static String rodTier10c = "stickOsmium"; //Screws - static String screwTier0 = "screwPotin"; - static String screwTier7 = "screwChrome"; - static String screwTier8 = "screwIridium"; - static String screwTier9 = "screwOsmium"; - static String screwTier10 = "screwNeutronium"; + public static String screwTier0 = "screwPotin"; + public static String screwTier7 = "screwChrome"; + public static String screwTier8 = "screwIridium"; + public static String screwTier9 = "screwOsmium"; + public static String screwTier10 = "screwNeutronium"; //Rotors - static String rotorTier0 = "rotorPotin"; - static String rotorTier7 = "rotorChrome"; - static String rotorTier8 = "rotorIridium"; - static String rotorTier9 = "rotorOsmium"; - static String rotorTier10 = "rotorNeutronium"; + public static String rotorTier0 = "rotorPotin"; + public static String rotorTier7 = "rotorChrome"; + public static String rotorTier8 = "rotorIridium"; + public static String rotorTier9 = "rotorOsmium"; + public static String rotorTier10 = "rotorNeutronium"; //Fluid Pipe - static String pipeTier0 = "pipeSmallLead"; - static String pipeTier7 = "pipeHugeSteel"; - static String pipeTier8 = "pipeHugeStainlessSteel"; - static String pipeTier9 = "pipeHugeTitanium"; - static String pipeTier10 = "pipeHugeTungstenSteel"; + public static String pipeTier0 = "pipeSmallLead"; + public static String pipeTier7 = "pipeHugeSteel"; + public static String pipeTier8 = "pipeHugeStainlessSteel"; + public static String pipeTier9 = "pipeHugeTitanium"; + public static String pipeTier10 = "pipeHugeTungstenSteel"; //Rubber Ring/Plate - static String itemRubberRing = "ringRubber"; - static String plateRubber = "plateRubber"; + public static String itemRubberRing = "ringRubber"; + public static String plateRubber = "plateRubber"; //Circuits - static String circuitTier0 = "circuitPrimitive"; - static String circuitTier1 = "circuitBasic"; - static String circuitTier6 = "circuitMaster"; - static String circuitTier7 = "circuitUltimate"; - static String circuitTier8 = "circuitSymbiotic"; - static String circuitTier9 = "circuitNeutronic"; - static String circuitTier10 = "circuitQuantum"; + public static String circuitTier0 = "circuitPrimitive"; + public static String circuitTier1 = "circuitBasic"; + public static String circuitTier6 = "circuitMaster"; + public static String circuitTier7 = "circuitUltimate"; + public static String circuitTier8 = "circuitSuperconductor"; + public static String circuitTier9 = "circuitInfinite"; + public static String circuitTier10 = "circuitQuantum"; //small gears - static String smallGearTier0 = "gearGtSmallWroughtIron"; - static String smallGearTier7 = "gearGtSmallChrome"; - static String smallGearTier8 = "gearGtSmallIridium"; - static String smallGearTier9 = "gearGtSmallOsmium"; - static String smallGearTier10 = "gearGtSmallNeutronium"; + public static String smallGearTier0 = "gearGtSmallWroughtIron"; + public static String smallGearTier7 = "gearGtSmallChrome"; + public static String smallGearTier8 = "gearGtSmallIridium"; + public static String smallGearTier9 = "gearGtSmallOsmium"; + public static String smallGearTier10 = "gearGtSmallNeutronium"; //Crafting Tools - static String craftingToolWrench = "craftingToolWrench"; - static String craftingToolScrewdriver = "craftingToolScrewdriver"; + public static String craftingToolWrench = "craftingToolWrench"; + public static String craftingToolScrewdriver = "craftingToolScrewdriver"; public static final void RECIPES_LOAD(){ Utils.LOG_INFO("Loading Recipes for the Various Circuits and Machine components."); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 71eb505e21..8b2cff593b 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -7,8 +7,6 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -213,8 +211,8 @@ public class RECIPES_Machines { static String circuitTier4 = "circuitElite"; static String circuitTier5 = "circuitMaster"; static String circuitTier6 = "circuitUltimate"; - static String circuitTier7 = "circuitSymbiotic"; - static String circuitTier8 = "circuitNeutronic"; + static String circuitTier7 = "circuitSuperconductor"; + static String circuitTier8 = "circuitInfinite"; static String circuitTier9 = "circuitQuantum"; //Machine Components @@ -374,17 +372,17 @@ public class RECIPES_Machines { if (LoadedMods.Gregtech){ RecipeUtils.addShapedGregtechRecipe( - ItemList.Electric_Piston_EV, GregtechOrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV, + ItemList.Electric_Piston_EV, OrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV, ItemList.Electric_Motor_EV, machineCasing_EV, ItemList.Electric_Motor_EV, "gearGtTitanium", "cableGt02Aluminium", "gearGtTitanium", ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 793, 1)); RecipeUtils.addShapedGregtechRecipe( - ItemList.Electric_Piston_IV, GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic), ItemList.Electric_Piston_IV, + ItemList.Electric_Piston_IV, OrePrefixes.circuit.get(Materials.Superconductor), ItemList.Electric_Piston_IV, ItemList.Electric_Motor_IV, machineCasing_IV, ItemList.Electric_Motor_IV, "gearGtTungstenSteel", "cableGt02Platinum", "gearGtTungstenSteel", ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 794, 1)); RecipeUtils.addShapedGregtechRecipe( - RECIPE_CONSTANTS.electricPiston_LuV, GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), RECIPE_CONSTANTS.electricPiston_LuV, + RECIPE_CONSTANTS.electricPiston_LuV, OrePrefixes.circuit.get(Materials.Infinite), RECIPE_CONSTANTS.electricPiston_LuV, RECIPE_CONSTANTS.electricMotor_LuV, machineCasing_LuV, RECIPE_CONSTANTS.electricMotor_LuV, "gearGtChrome", "cableGt02Tungsten", "gearGtChrome", ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 795, 1)); diff --git a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java index ca7d1cf6ea..72c33a2011 100644 --- a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java +++ b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java @@ -404,7 +404,10 @@ public class RecipeUtils { public static boolean addShapelessGregtechRecipe(final Object[] inputItems, final ItemStack OutputItem){ //Catch Invalid Recipes - if (inputItems.length > 9 || inputItems.length < 2){ + if (inputItems.length > 9 || inputItems.length < 1){ + if (OutputItem != null){ + Utils.LOG_INFO("Invalid input array for shapeless recipe, which should output "+OutputItem.getDisplayName()); + } return false; } //let gregtech handle shapeless recipes. |