Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Make assembly line use cheaper circuit techs. #1114

Browse source
This commit is contained in:
Blood-Asp 2017-07-01 18:42:02 +02:00
parent 7642e16c3c
commit a0031717d1
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
View file

@ -1853,9 +1853,9 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSG, 3L), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSG, 3L),
ItemList.Electric_Motor_LuV.get(2, new Object(){}), ItemList.Electric_Motor_LuV.get(2, new Object(){}),
ItemList.Electric_Piston_LuV.get(1, new Object(){}), ItemList.Electric_Piston_LuV.get(1, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2L), ItemList.Circuit_Masterquantumcomputer.get(2, null),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2L), ItemList.Circuit_Quantumcomputer.get(2, null),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 6L), ItemList.Circuit_Nanoprocessor.get(6,null),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6L)}, new FluidStack[]{ GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(576), Materials.SolderingAlloy.getMolten(576),
Materials.Lubricant.getFluid(250)}, ItemList.Robot_Arm_LuV.get(1, new Object[]{}), 600, 6000); Materials.Lubricant.getFluid(250)}, ItemList.Robot_Arm_LuV.get(1, new Object[]{}), 600, 6000);
@ -1866,9 +1866,9 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSE, 3L), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSE, 3L),
ItemList.Electric_Motor_ZPM.get(2, new Object(){}), ItemList.Electric_Motor_ZPM.get(2, new Object(){}),
ItemList.Electric_Piston_ZPM.get(1, new Object(){}), ItemList.Electric_Piston_ZPM.get(1, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L), ItemList.Circuit_Masterquantumcomputer.get(4, null),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 4L), ItemList.Circuit_Quantumcomputer.get(4, null),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 12L), ItemList.Circuit_Nanoprocessor.get(12,null),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6L)}, new FluidStack[]{ GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(1152), Materials.SolderingAlloy.getMolten(1152),
Materials.Lubricant.getFluid(750)}, ItemList.Robot_Arm_ZPM.get(1, new Object[]{}), 600, 24000); Materials.Lubricant.getFluid(750)}, ItemList.Robot_Arm_ZPM.get(1, new Object[]{}), 600, 24000);
@ -1879,9 +1879,9 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3L), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3L),
ItemList.Electric_Motor_UV.get(2, new Object(){}), ItemList.Electric_Motor_UV.get(2, new Object(){}),
ItemList.Electric_Piston_UV.get(1, new Object(){}), ItemList.Electric_Piston_UV.get(1, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 8L), ItemList.Circuit_Crystalcomputer.get(8, null),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 8L), ItemList.Circuit_Crystalprocessor.get(8, null),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 24L), ItemList.Circuit_Nanoprocessor.get(24,null),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 6L)}, new FluidStack[]{ GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 6L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(2304), Materials.SolderingAlloy.getMolten(2304),
Materials.Lubricant.getFluid(2000)}, ItemList.Robot_Arm_UV.get(1, new Object[]{}), 600, 100000); Materials.Lubricant.getFluid(2000)}, ItemList.Robot_Arm_UV.get(1, new Object[]{}), 600, 100000);
@ -1894,7 +1894,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Emitter_IV.get(1, new Object(){}), ItemList.Emitter_IV.get(1, new Object(){}),
ItemList.Emitter_EV.get(2, new Object(){}), ItemList.Emitter_EV.get(2, new Object(){}),
ItemList.Emitter_HV.get(4, new Object(){}), ItemList.Emitter_HV.get(4, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 7L), ItemList.Circuit_Nanoprocessor.get(7,null),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
@ -1907,7 +1907,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Emitter_LuV.get(1, new Object(){}), ItemList.Emitter_LuV.get(1, new Object(){}),
ItemList.Emitter_IV.get(2, new Object(){}), ItemList.Emitter_IV.get(2, new Object(){}),
ItemList.Emitter_EV.get(4, new Object(){}), ItemList.Emitter_EV.get(4, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 7L), ItemList.Circuit_Quantumcomputer.get(7, null),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
@ -1920,7 +1920,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Emitter_ZPM.get(1, new Object(){}), ItemList.Emitter_ZPM.get(1, new Object(){}),
ItemList.Emitter_LuV.get(2, new Object(){}), ItemList.Emitter_LuV.get(2, new Object(){}),
ItemList.Emitter_IV.get(4, new Object(){}), ItemList.Emitter_IV.get(4, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 7L), ItemList.Circuit_Crystalcomputer.get(7, null),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
@ -1935,7 +1935,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Sensor_IV.get(1, new Object(){}), ItemList.Sensor_IV.get(1, new Object(){}),
ItemList.Sensor_EV.get(2, new Object(){}), ItemList.Sensor_EV.get(2, new Object(){}),
ItemList.Sensor_HV.get(4, new Object(){}), ItemList.Sensor_HV.get(4, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 7L), ItemList.Circuit_Nanoprocessor.get(7,null),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
@ -1948,7 +1948,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Sensor_LuV.get(1, new Object(){}), ItemList.Sensor_LuV.get(1, new Object(){}),
ItemList.Sensor_IV.get(2, new Object(){}), ItemList.Sensor_IV.get(2, new Object(){}),
ItemList.Sensor_EV.get(4, new Object(){}), ItemList.Sensor_EV.get(4, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 7L), ItemList.Circuit_Quantumcomputer.get(7, null),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
@ -1961,7 +1961,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Sensor_ZPM.get(1, new Object(){}), ItemList.Sensor_ZPM.get(1, new Object(){}),
ItemList.Sensor_LuV.get(2, new Object(){}), ItemList.Sensor_LuV.get(2, new Object(){}),
ItemList.Sensor_IV.get(4, new Object(){}), ItemList.Sensor_IV.get(4, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 7L), ItemList.Circuit_Crystalcomputer.get(7, null),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
@ -1976,7 +1976,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSG, 6L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSG, 6L),
ItemList.QuantumStar.get(1, new Object(){}), ItemList.QuantumStar.get(1, new Object(){}),
ItemList.Emitter_LuV.get(4, new Object(){}), ItemList.Emitter_LuV.get(4, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 8L), ItemList.Circuit_Masterquantumcomputer.get(8, null),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
@ -1990,7 +1990,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 6L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 6L),
ItemList.QuantumStar.get(4, new Object(){}), ItemList.QuantumStar.get(4, new Object(){}),
ItemList.Emitter_ZPM.get(4, new Object(){}), ItemList.Emitter_ZPM.get(4, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 16L), ItemList.Circuit_Crystalcomputer.get(16, null),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
@ -2008,7 +2008,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L),
ItemList.Gravistar.get(1, new Object(){}), ItemList.Gravistar.get(1, new Object(){}),
ItemList.Emitter_UV.get(4, new Object(){}), ItemList.Emitter_UV.get(4, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 64L), ItemList.Circuit_Neuroprocessor.get(64, null),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
@ -2025,7 +2025,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumHelmet", 1L)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumHelmet", 1L));
GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoHelmet", 1L, GT_Values.W), 144000, new ItemStack[]{ GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoHelmet", 1L, GT_Values.W), 144000, new ItemStack[]{
GT_ModHandler.getIC2Item("nanoHelmet", 1L, GT_Values.W), GT_ModHandler.getIC2Item("nanoHelmet", 1L, GT_Values.W),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), ItemList.Circuit_Masterquantumcomputer.get(2, null),
GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 4), GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 4),
ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), ItemList.Energy_LapotronicOrb.get(1, new Object[]{}),
ItemList.Sensor_IV.get(1, new Object[]{}), ItemList.Sensor_IV.get(1, new Object[]{}),
@ -2039,7 +2039,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumBodyarmor", 1L)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumBodyarmor", 1L));
GT_Values.RA.addAssemblylineRecipe(Loader.isModLoaded("GraviSuite") ? GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, GT_Values.W) : GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, GT_Values.W), 144000, new ItemStack[]{ GT_Values.RA.addAssemblylineRecipe(Loader.isModLoaded("GraviSuite") ? GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, GT_Values.W) : GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, GT_Values.W), 144000, new ItemStack[]{
Loader.isModLoaded("GraviSuite") ? GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, GT_Values.W) : GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, GT_Values.W), Loader.isModLoaded("GraviSuite") ? GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, GT_Values.W) : GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, GT_Values.W),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), ItemList.Circuit_Masterquantumcomputer.get(2, null),
GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 6), GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 6),
ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), ItemList.Energy_LapotronicOrb.get(1, new Object[]{}),
ItemList.Field_Generator_HV.get(2, new Object[]{}), ItemList.Field_Generator_HV.get(2, new Object[]{}),
@ -2053,7 +2053,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumLeggings", 1L)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumLeggings", 1L));
GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoLeggings", 1L, GT_Values.W), 144000, new ItemStack[]{ GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoLeggings", 1L, GT_Values.W), 144000, new ItemStack[]{
GT_ModHandler.getIC2Item("nanoLeggings", 1L, GT_Values.W), GT_ModHandler.getIC2Item("nanoLeggings", 1L, GT_Values.W),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), ItemList.Circuit_Masterquantumcomputer.get(2, null),
GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 6), GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 6),
ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), ItemList.Energy_LapotronicOrb.get(1, new Object[]{}),
ItemList.Field_Generator_HV.get(2, new Object[]{}), ItemList.Field_Generator_HV.get(2, new Object[]{}),
@ -2067,7 +2067,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumBoots", 1L)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumBoots", 1L));
GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoBoots", 1L, GT_Values.W), 144000, new ItemStack[]{ GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoBoots", 1L, GT_Values.W), 144000, new ItemStack[]{
GT_ModHandler.getIC2Item("nanoBoots", 1L, GT_Values.W), GT_ModHandler.getIC2Item("nanoBoots", 1L, GT_Values.W),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), ItemList.Circuit_Masterquantumcomputer.get(2, null),
GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 4), GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 4),
ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), ItemList.Energy_LapotronicOrb.get(1, new Object[]{}),
ItemList.Field_Generator_HV.get(1, new Object[]{}), ItemList.Field_Generator_HV.get(1, new Object[]{}),
@ -2083,7 +2083,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("quantumBodyarmor", 1L, GT_Values.W), 144000, new ItemStack[]{ GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("quantumBodyarmor", 1L, GT_Values.W), 144000, new ItemStack[]{
GT_ModHandler.getIC2Item("quantumBodyarmor", 1L, GT_Values.W), GT_ModHandler.getIC2Item("quantumBodyarmor", 1L, GT_Values.W),
GT_ModHandler.getModItem("GraviSuite", "ultimateLappack", 1, GT_Values.W), GT_ModHandler.getModItem("GraviSuite", "ultimateLappack", 1, GT_Values.W),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), ItemList.Circuit_Ultimatecrystalcomputer.get(2, null),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Duranium, 6), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Duranium, 6),
ItemList.Energy_LapotronicOrb2.get(1, new Object[]{}), ItemList.Energy_LapotronicOrb2.get(1, new Object[]{}),
ItemList.Field_Generator_IV.get(2, new Object[]{}), ItemList.Field_Generator_IV.get(2, new Object[]{}),