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

Merge pull request #1147 from SLiMylya/addnewbattery

Browse source 
Add new zpm and uv battery
This commit is contained in:
Blood-Asp 2017-09-03 14:38:59 +02:00 committed by GitHub
commit 2555acf75f
23 changed files with 104 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/gregtech/api/enums/ItemList.java
View file

@ -628,6 +628,7 @@ public enum ItemList implements IItemContainer {
MagicEnergyAbsorber_LV, MagicEnergyAbsorber_MV, MagicEnergyAbsorber_HV, MagicEnergyAbsorber_EV,
Depleted_Thorium_1, Depleted_Thorium_2, Depleted_Thorium_4,
Processing_Array, Distillation_Tower, Energy_LapotronicOrb2,
Energy_Module, Energy_Cluster,
ZPM2, Quantum_Tank_LV, Quantum_Tank_MV, Quantum_Tank_HV, Quantum_Tank_EV, Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV,
NULL, Cover_RedstoneTransmitterExternal, Cover_RedstoneTransmitterInternal, Cover_RedstoneReceiverExternal, Cover_RedstoneReceiverInternal,

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

@ -438,17 +438,22 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
GT_Values.RA.addCannerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 32L), ItemList.Battery_Hull_HV.get(1L, new Object[0]), ItemList.Battery_RE_HV_Lithium.get(1L, new Object[0]), null, 1600, 2);
GT_Values.RA.addCannerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 32L), ItemList.Battery_Hull_HV.get(1L, new Object[0]), ItemList.Battery_RE_HV_Sodium.get(1L, new Object[0]), null, 1600, 2);
ItemList.Energy_LapotronicOrb.set(addItem(tLastID = 597, "Lapotronic Energy Orb", "", 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)}));
ItemList.Energy_LapotronicOrb.set(addItem(tLastID = 597, "Lapotronic Energy Orb", "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, 100000000L, GT_Values.V[5], 5L, -3L, true);
ItemList.ZPM.set(addItem(tLastID = 598, "Zero Point Module", "", 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)}));
ItemList.ZPM.set(addItem(tLastID = 598, "Zero Point Module", "Single use 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, 2000000000000L, GT_Values.V[7], 7L, -2L, true);
ItemList.Energy_LapotronicOrb2.set(addItem(tLastID = 599, "Lapotronic Energy Orb Cluster", "", 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)}));
ItemList.Energy_LapotronicOrb2.set(addItem(tLastID = 599, "Lapotronic Energy Orb Cluster", "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, 1000000000L, GT_Values.V[6], 6L, -3L, true);
ItemList.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", 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, Long.MAX_VALUE, GT_Values.V[8], 8L, -3L, true);
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_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)}));
@ -770,6 +775,14 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
GregTech_API.registerCover(ItemList.Cover_NeedsMaintainance.get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[2][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ACTIVITYDETECTOR)}), new GT_Cover_NeedMaintainance());
GT_Values.RA.addAssemblerRecipe(ItemList.Emitter_MV.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), ItemList.Cover_NeedsMaintainance.get(1L, new Object[0]), 600, 24);
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.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", 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, Long.MAX_VALUE, GT_Values.V[8], 8L, -3L, true);
}

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

@ -207,7 +207,9 @@ public class GT_Achievements {
registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1, new Object[]{}), "alienmetallurgy", false);
registerAchievement("finalpreparations", 7, 9, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L), "over9000", false);
registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "finalpreparations", false);
registerAchievement("whatnow", 4, 10, ItemList.ZPM2.get(1, new Object[]{}), "denseaspossible", false);
registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1, new Object[]{}), "denseaspossible", false);
registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1, new Object[]{}), "zpmage", false);
registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1, new Object[]{}), "uvage", false);
// if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){
// for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {
@ -597,6 +599,10 @@ public class GT_Achievements {
issueAchievement(player, "filterregulate");
} else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32605")) {
issueAchievement(player, "whatnow");
} 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.metaitem.03.32030")) {
issueAchievement(player, "gtmonosilicon");
} else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32036")) {
@ -611,6 +617,10 @@ public class GT_Achievements {
issueAchievement(player, "gtwetware");
} else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32095")) {
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")) {
issueAchievement(player, "newfuel");

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

@ -2126,24 +2126,77 @@ if(Loader.isModLoaded("Railcraft")){
Materials.SolderingAlloy.getMolten(2880),
GregTech_API.mIC2Classic ? Materials.Water.getFluid(10000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000)
}, ItemList.Circuit_Wetwaremainframe.get(1,o), 2000, 300000);
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),
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),
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.Field_Generator_LuV.get(2, o),
ItemList.Circuit_Wafer_SoC2.get(64, o),
ItemList.Circuit_Wafer_SoC2.get(64, o),
ItemList.Circuit_Parts_DiodeSMD.get(8, o),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 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);
Materials.SolderingAlloy.getMolten(2880),
GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)
}, ItemList.Energy_Module.get(1, o), 2000, 100000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1, o), 288000, new ItemStack[]{
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.Energy_Module.get(8L, new Object[0]),
ItemList.Field_Generator_ZPM.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.cableGt01, Materials.NaquadahAlloy, 32),
}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(2880),
GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)
}, ItemList.Energy_Cluster.get(1, o), 2000, 200000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Cluster.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_Cluster.get(8L, new Object[0]),
ItemList.Field_Generator_UV.get(2, o),
ItemList.Circuit_Neuroprocessor.get(64, o),
ItemList.Circuit_Neuroprocessor.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),
Materials.Naquadria.getMolten(1152)
}, 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[]{
ItemList.Casing_Fusion_Coil.get(1,o),
ItemList.Circuit_Quantummainframe.get(1,o),

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

@ -490,6 +490,10 @@ achievement.gt.metaitem.01.32605=Ultimate Battery
achievement.gt.metaitem.01.32605.desc=Pickup this item to see the recipe in NEI
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.32736=Energy Module
achievement.gt.metaitem.01.32736.desc=Pickup this item to see the recipe in NEI
achievement.gt.metaitem.01.32737=Energy Cluster
achievement.gt.metaitem.01.32737.desc=Pickup this item to see the recipe in NEI
achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet
achievement.ic2.itemArmorQuantumHelmet.desc=Pickup this item to see the recipe in NEI

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 330 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 328 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 322 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 323 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 319 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 322 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 322 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 330 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 330 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 319 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 325 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 317 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 313 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 310 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 313 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 321 B

BIN
src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 319 B