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

add config EnableZPMandUVBatteries default false

Browse source
This commit is contained in:
SLiMylya 2017-07-17 12:56:37 +03:00
parent 612cece629
commit 820b335d83
4 changed files with 79 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
View file

@ -449,6 +449,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
ItemList.Energy_Module.set(addItem(tLastID = 736, "Energy Module", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)}));
setElectricStats(32000 + tLastID, 10000000000L, GT_Values.V[7], 7L, -3L, true);
ItemList.Energy_Cluster.set(addItem(tLastID = 737, "Energy Cluster", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)}));
setElectricStats(32000 + tLastID, 100000000000L, GT_Values.V[8], 8L, -3L, true);
ItemList.Electric_Motor_LV.set(addItem(tLastID = 600, "Electric Motor (LV)", "", 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.MOTUS, 1L)})); ItemList.Electric_Motor_LV.set(addItem(tLastID = 600, "Electric Motor (LV)", "", 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.MOTUS, 1L)}));
ItemList.Electric_Motor_MV.set(addItem(tLastID = 601, "Electric Motor (MV)", "", 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.MOTUS, 2L)})); ItemList.Electric_Motor_MV.set(addItem(tLastID = 601, "Electric Motor (MV)", "", 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.MOTUS, 2L)}));
ItemList.Electric_Motor_HV.set(addItem(tLastID = 602, "Electric Motor (HV)", "", 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.MOTUS, 4L)})); ItemList.Electric_Motor_HV.set(addItem(tLastID = 602, "Electric Motor (HV)", "", 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.MOTUS, 4L)}));

4
src/main/java/gregtech/loaders/misc/GT_Achievements.java
View file

@ -617,6 +617,10 @@ public class GT_Achievements {
issueAchievement(player, "gtwetware"); issueAchievement(player, "gtwetware");
} else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32095")) { } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32095")) {
issueAchievement(player, "gtwetmain"); issueAchievement(player, "gtwetmain");
} else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32736")) {
issueAchievement(player, "zpmage");
} else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32737")) {
issueAchievement(player, "uvage");
} }
} else if (stack.getUnlocalizedName().equals("gt.Thoriumcell")) { } else if (stack.getUnlocalizedName().equals("gt.Thoriumcell")) {
issueAchievement(player, "newfuel"); issueAchievement(player, "newfuel");

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

@ -2128,58 +2128,76 @@ if(Loader.isModLoaded("Railcraft")){
GregTech_API.mIC2Classic ? Materials.Water.getFluid(10000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000) GregTech_API.mIC2Classic ? Materials.Water.getFluid(10000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000)
}, ItemList.Circuit_Wetwaremainframe.get(1,o), 2000, 300000); }, ItemList.Circuit_Wetwaremainframe.get(1,o), 2000, 300000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1,o), 288000, new ItemStack[]{ if (GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false)) {
GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1, o), 288000, new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L),
ItemList.Circuit_Wetwarecomputer.get(1,o), ItemList.Circuit_Wetwarecomputer.get(1, o),
ItemList.Circuit_Wetwarecomputer.get(1,o), ItemList.Circuit_Wetwarecomputer.get(1, o),
ItemList.Circuit_Wetwarecomputer.get(1,o), ItemList.Circuit_Wetwarecomputer.get(1, o),
ItemList.Circuit_Wetwarecomputer.get(1,o), ItemList.Circuit_Wetwarecomputer.get(1, o),
ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]),
ItemList.Field_Generator_LuV.get(2,o), ItemList.Field_Generator_LuV.get(2, o),
ItemList.Circuit_Wafer_SoC2.get(64,o), ItemList.Circuit_Wafer_SoC2.get(64, o),
ItemList.Circuit_Wafer_SoC2.get(64,o), ItemList.Circuit_Wafer_SoC2.get(64, o),
ItemList.Circuit_Parts_DiodeSMD.get(8,o), ItemList.Circuit_Parts_DiodeSMD.get(8, o),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32),
}, new FluidStack[]{ }, new FluidStack[]{
Materials.SolderingAlloy.getMolten(2880), Materials.SolderingAlloy.getMolten(2880),
GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)
}, ItemList.Energy_Module.get(1,o), 2000, 100000); }, ItemList.Energy_Module.get(1, o), 2000, 100000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1,o), 288000, new ItemStack[]{ GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1, o), 288000, new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16L),
ItemList.Circuit_Wetwaresupercomputer.get(1,o), ItemList.Circuit_Wetwaresupercomputer.get(1, o),
ItemList.Circuit_Wetwaresupercomputer.get(1,o), ItemList.Circuit_Wetwaresupercomputer.get(1, o),
ItemList.Circuit_Wetwaresupercomputer.get(1,o), ItemList.Circuit_Wetwaresupercomputer.get(1, o),
ItemList.Circuit_Wetwaresupercomputer.get(1,o), ItemList.Circuit_Wetwaresupercomputer.get(1, o),
ItemList.Energy_Module.get(8L, new Object[0]), ItemList.Energy_Module.get(8L, new Object[0]),
ItemList.Field_Generator_ZPM.get(2,o), ItemList.Field_Generator_ZPM.get(2, o),
ItemList.Circuit_Wafer_HPIC.get(64,o), ItemList.Circuit_Wafer_HPIC.get(64, o),
ItemList.Circuit_Wafer_HPIC.get(64,o), ItemList.Circuit_Wafer_HPIC.get(64, o),
ItemList.Circuit_Parts_DiodeSMD.get(16,o), ItemList.Circuit_Parts_DiodeSMD.get(16, o),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32),
}, new FluidStack[]{ }, new FluidStack[]{
Materials.SolderingAlloy.getMolten(2880), Materials.SolderingAlloy.getMolten(2880),
GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)
}, ItemList.Energy_Cluster.get(1,o), 2000, 200000); }, ItemList.Energy_Cluster.get(1, o), 2000, 200000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Cluster.get(1,o), 288000, new ItemStack[]{ GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Cluster.get(1, o), 288000, new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L),
ItemList.Circuit_Wetwaremainframe.get(1,o), ItemList.Circuit_Wetwaremainframe.get(1, o),
ItemList.Circuit_Wetwaremainframe.get(1,o), ItemList.Circuit_Wetwaremainframe.get(1, o),
ItemList.Circuit_Wetwaremainframe.get(1,o), ItemList.Circuit_Wetwaremainframe.get(1, o),
ItemList.Circuit_Wetwaremainframe.get(1,o), ItemList.Circuit_Wetwaremainframe.get(1, o),
ItemList.Energy_Cluster.get(8L, new Object[0]), ItemList.Energy_Cluster.get(8L, new Object[0]),
ItemList.Field_Generator_UV.get(2,o), ItemList.Field_Generator_UV.get(2, o),
ItemList.Circuit_Neuroprocessor.get(64,o), ItemList.Circuit_Neuroprocessor.get(64, o),
ItemList.Circuit_Neuroprocessor.get(64,o), ItemList.Circuit_Neuroprocessor.get(64, o),
ItemList.Circuit_Parts_DiodeSMD.get(16,o), ItemList.Circuit_Parts_DiodeSMD.get(16, o),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32),
}, new FluidStack[]{ }, new FluidStack[]{
Materials.SolderingAlloy.getMolten(2880), Materials.SolderingAlloy.getMolten(2880),
GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000),
Materials.Naquadria.getMolten(1152) Materials.Naquadria.getMolten(1152)
}, ItemList.ZPM2.get(1,o), 2000, 300000); }, ItemList.ZPM2.get(1, o), 2000, 300000);
}else {
GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1, o), 288000, new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L),
ItemList.Circuit_Wetwaremainframe.get(1, o),
ItemList.Circuit_Wetwaremainframe.get(1, o),
ItemList.Circuit_Wetwaremainframe.get(1, o),
ItemList.Circuit_Wetwaremainframe.get(1, o),
ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]),
ItemList.Field_Generator_UV.get(2, o),
ItemList.Circuit_Wafer_HPIC.get(64, o),
ItemList.Circuit_Wafer_HPIC.get(64, o),
ItemList.Circuit_Parts_DiodeSMD.get(16, o),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32),
}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(2880),
GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)
}, ItemList.ZPM2.get(1, o), 2000, 300000);
}
GT_Values.RA.addAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1), 144000, new ItemStack[]{ GT_Values.RA.addAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1), 144000, new ItemStack[]{
ItemList.Casing_Fusion_Coil.get(1,o), ItemList.Casing_Fusion_Coil.get(1,o),
ItemList.Circuit_Quantummainframe.get(1,o), ItemList.Circuit_Quantummainframe.get(1,o),

6
src/main/resources/assets/gregtech/lang/en_US.lang
View file

@ -408,12 +408,8 @@ achievement.finalpreparations=Final Preparations
achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot
achievement.denseaspossible=As Dense As Possible achievement.denseaspossible=As Dense As Possible
achievement.denseaspossible.desc=Produce Neutronium achievement.denseaspossible.desc=Produce Neutronium
achievement.zpmage=Welcome to ZPM Energy Age
achievement.zpmage.desc=Craft a Energy Module
achievement.whatnow=What now? achievement.whatnow=What now?
achievement.whatnow.desc=Craft a Ultimate Battery achievement.whatnow.desc=Craft a Ultimate Battery
achievement.uvage=Welcome to UV Energy Age
achievement.uvage.desc=Energy Cluster
achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606=Electric Motor LuV tier
achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI
@ -496,7 +492,7 @@ achievement.gt.metaitem.01.32609=Really Ultimate Battery
achievement.gt.metaitem.01.32609.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32609.desc=Pickup this item to see the recipe in NEI
achievement.gt.metaitem.01.32736=Energy Module achievement.gt.metaitem.01.32736=Energy Module
achievement.gt.metaitem.01.32736.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32736.desc=Pickup this item to see the recipe in NEI
achievement.gt.metaitem.01.32737=Maximum Battery achievement.gt.metaitem.01.32737=Energy Cluster
achievement.gt.metaitem.01.32737.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32737.desc=Pickup this item to see the recipe in NEI
achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet