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

Fix #1167

Browse source
This commit is contained in:
Blood-Asp 2017-09-03 17:10:27 +02:00
parent d0e3e9d68d
commit a6a7484138
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1842,16 +1842,16 @@ if(Loader.isModLoaded("Railcraft")){
// RobotArm
Object o = new Object[0];
GT_Values.RA.addAssemblylineRecipe(ItemList.Robot_Arm_IV.get(1, new Object(){}),144000,new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSG, 4L),
GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSG, 1L),
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSG, 3L),
ItemList.Electric_Motor_LuV.get(2, new Object(){}),
ItemList.Electric_Piston_LuV.get(1, new Object(){}),
ItemList.Circuit_Masterquantumcomputer.get(2, null),
ItemList.Circuit_Quantumcomputer.get(2, null),
ItemList.Circuit_Nanoprocessor.get(6,null),
ItemList.Circuit_Masterquantumcomputer.get(2, o),
ItemList.Circuit_Quantumcomputer.get(2, o),
ItemList.Circuit_Nanoprocessor.get(6,o),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(576),
Materials.Lubricant.getFluid(250)}, ItemList.Robot_Arm_LuV.get(1, new Object[]{}), 600, 6000);
@ -1862,9 +1862,9 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSE, 3L),
ItemList.Electric_Motor_ZPM.get(2, new Object(){}),
ItemList.Electric_Piston_ZPM.get(1, new Object(){}),
ItemList.Circuit_Masterquantumcomputer.get(4, null),
ItemList.Circuit_Quantumcomputer.get(4, null),
ItemList.Circuit_Nanoprocessor.get(12,null),
ItemList.Circuit_Masterquantumcomputer.get(4, o),
ItemList.Circuit_Quantumcomputer.get(4, o),
ItemList.Circuit_Nanoprocessor.get(12,o),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(1152),
Materials.Lubricant.getFluid(750)}, ItemList.Robot_Arm_ZPM.get(1, new Object[]{}), 600, 24000);
@ -1875,9 +1875,9 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3L),
ItemList.Electric_Motor_UV.get(2, new Object(){}),
ItemList.Electric_Piston_UV.get(1, new Object(){}),
ItemList.Circuit_Crystalcomputer.get(8, null),
ItemList.Circuit_Crystalprocessor.get(8, null),
ItemList.Circuit_Nanoprocessor.get(24,null),
ItemList.Circuit_Crystalcomputer.get(8, o),
ItemList.Circuit_Crystalprocessor.get(8, o),
ItemList.Circuit_Nanoprocessor.get(24,o),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 6L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(2304),
Materials.Lubricant.getFluid(2000)}, ItemList.Robot_Arm_UV.get(1, new Object[]{}), 600, 100000);
@ -1890,7 +1890,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Emitter_IV.get(1, new Object(){}),
ItemList.Emitter_EV.get(2, new Object(){}),
ItemList.Emitter_HV.get(4, new Object(){}),
ItemList.Circuit_Nanoprocessor.get(7,null),
ItemList.Circuit_Nanoprocessor.get(7,o),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
@ -1903,7 +1903,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Emitter_LuV.get(1, new Object(){}),
ItemList.Emitter_IV.get(2, new Object(){}),
ItemList.Emitter_EV.get(4, new Object(){}),
ItemList.Circuit_Quantumcomputer.get(7, null),
ItemList.Circuit_Quantumcomputer.get(7, o),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
@ -1916,7 +1916,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Emitter_ZPM.get(1, new Object(){}),
ItemList.Emitter_LuV.get(2, new Object(){}),
ItemList.Emitter_IV.get(4, new Object(){}),
ItemList.Circuit_Crystalcomputer.get(7, null),
ItemList.Circuit_Crystalcomputer.get(7, o),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
@ -1931,7 +1931,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Sensor_IV.get(1, new Object(){}),
ItemList.Sensor_EV.get(2, new Object(){}),
ItemList.Sensor_HV.get(4, new Object(){}),
ItemList.Circuit_Nanoprocessor.get(7,null),
ItemList.Circuit_Nanoprocessor.get(7,o),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
@ -1944,7 +1944,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Sensor_LuV.get(1, new Object(){}),
ItemList.Sensor_IV.get(2, new Object(){}),
ItemList.Sensor_EV.get(4, new Object(){}),
ItemList.Circuit_Quantumcomputer.get(7, null),
ItemList.Circuit_Quantumcomputer.get(7, o),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
@ -1957,7 +1957,7 @@ if(Loader.isModLoaded("Railcraft")){
ItemList.Sensor_ZPM.get(1, new Object(){}),
ItemList.Sensor_LuV.get(2, new Object(){}),
ItemList.Sensor_IV.get(4, new Object(){}),
ItemList.Circuit_Crystalcomputer.get(7, null),
ItemList.Circuit_Crystalcomputer.get(7, o),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
@ -1972,7 +1972,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSG, 6L),
ItemList.QuantumStar.get(1, new Object(){}),
ItemList.Emitter_LuV.get(4, new Object(){}),
ItemList.Circuit_Masterquantumcomputer.get(8, null),
ItemList.Circuit_Masterquantumcomputer.get(8, o),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
@ -1986,7 +1986,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 6L),
ItemList.QuantumStar.get(4, new Object(){}),
ItemList.Emitter_ZPM.get(4, new Object(){}),
ItemList.Circuit_Crystalcomputer.get(16, null),
ItemList.Circuit_Crystalcomputer.get(16, o),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
@ -2004,7 +2004,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L),
ItemList.Gravistar.get(1, new Object(){}),
ItemList.Emitter_UV.get(4, new Object(){}),
ItemList.Circuit_Neuroprocessor.get(64, null),
ItemList.Circuit_Neuroprocessor.get(64, o),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
@ -2021,7 +2021,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumHelmet", 1L));
GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoHelmet", 1L, GT_Values.W), 144000, new ItemStack[]{
GT_ModHandler.getIC2Item("nanoHelmet", 1L, GT_Values.W),
ItemList.Circuit_Masterquantumcomputer.get(2, null),
ItemList.Circuit_Masterquantumcomputer.get(2, o),
GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 4),
ItemList.Energy_LapotronicOrb.get(1, new Object[]{}),
ItemList.Sensor_IV.get(1, new Object[]{}),
@ -2035,7 +2035,7 @@ if(Loader.isModLoaded("Railcraft")){
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[]{
Loader.isModLoaded("GraviSuite") ? GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, GT_Values.W) : GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, GT_Values.W),
ItemList.Circuit_Masterquantumcomputer.get(2, null),
ItemList.Circuit_Masterquantumcomputer.get(2, o),
GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 6),
ItemList.Energy_LapotronicOrb.get(1, new Object[]{}),
ItemList.Field_Generator_HV.get(2, new Object[]{}),
@ -2049,7 +2049,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumLeggings", 1L));
GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoLeggings", 1L, GT_Values.W), 144000, new ItemStack[]{
GT_ModHandler.getIC2Item("nanoLeggings", 1L, GT_Values.W),
ItemList.Circuit_Masterquantumcomputer.get(2, null),
ItemList.Circuit_Masterquantumcomputer.get(2, o),
GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 6),
ItemList.Energy_LapotronicOrb.get(1, new Object[]{}),
ItemList.Field_Generator_HV.get(2, new Object[]{}),
@ -2063,7 +2063,7 @@ if(Loader.isModLoaded("Railcraft")){
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumBoots", 1L));
GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoBoots", 1L, GT_Values.W), 144000, new ItemStack[]{
GT_ModHandler.getIC2Item("nanoBoots", 1L, GT_Values.W),
ItemList.Circuit_Masterquantumcomputer.get(2, null),
ItemList.Circuit_Masterquantumcomputer.get(2, o),
GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 4),
ItemList.Energy_LapotronicOrb.get(1, new Object[]{}),
ItemList.Field_Generator_HV.get(1, new Object[]{}),
@ -2079,10 +2079,11 @@ if(Loader.isModLoaded("Railcraft")){
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.getModItem("GraviSuite", "ultimateLappack", 1, GT_Values.W),
ItemList.Circuit_Ultimatecrystalcomputer.get(2, null),
ItemList.Circuit_Ultimatecrystalcomputer.get(2, o),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Duranium, 6),
ItemList.Energy_LapotronicOrb2.get(1, new Object[]{}),
ItemList.Field_Generator_IV.get(2, new Object[]{}),
GT_ModHandler.getModItem("GraviSuite", "itemSimpleItem", 4, 3),
ItemList.Electric_Motor_ZPM.get(2, new Object[]{}),
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 32),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Duranium, 4)
@ -2092,7 +2093,6 @@ if(Loader.isModLoaded("Railcraft")){
}, GT_ModHandler.getModItem("GraviSuite", "graviChestPlate", 1, 27), 1500, 16388);
}
Object o = new Object[0];
GT_Values.RA.addAssemblylineRecipe(ItemList.Circuit_Crystalmainframe.get(1,o), 72000, new ItemStack[]{
ItemList.Circuit_Board_Wetware.get(1,o),
ItemList.Circuit_Chip_Stemcell.get(8,o),