Merge pull request #1147 from SLiMylya/addnewbattery

Add new zpm and uv battery

2 files changed, 81 insertions, 18 deletions

diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index 7d560f0a96..d2bf8a7392 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -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");
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index c49e4d9a39..ec298f8afe 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -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),