cherry pick

820b335d831f60e1936c462d0cb8e7dba3c13fae
733d77481757b6b1619408ea6f4766f770b45419
e2017c72c30c4eac9fff231482da660b7eccd370
147101ff6cfb6bc2a0d8a46bad8aa77c943b7429
612cece6299ed698146d041d1277b52fa6e65df1
820b335d831f60e1936c462d0cb8e7dba3c13fae

Add new zpm and uv battery #1147

2 files changed, 50 insertions, 6 deletions

diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index 143e141423..633fd8af93 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -211,8 +211,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++) {
 //                if ((GregTech_API.sGeneratedMaterials[i] != null) && !oreList.contains(GregTech_API.sGeneratedMaterials[i])) {
@@ -600,6 +601,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")) {
@@ -614,6 +619,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 a6f9eff73d..62c651141d 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -2317,13 +2317,48 @@ public class GT_MachineRecipeLoader implements Runnable {
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
-        		GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 8L)}, new FluidStack[]{
+        		GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 8L)},
+                new FluidStack[]{
         		Materials.SolderingAlloy.getMolten(2304)},
         		ItemList.Field_Generator_UV.get(1, new Object[]{}), 600, 100000);
         
 
             Object o = new Object[0];
-            GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1,o), 288000, new ItemStack[]{
+
+        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(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, 32L),
+                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_LapotronicOrb2.get(1,o), 288000, new ItemStack[]{
             		GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 64L),
             		ItemList.Circuit_Wetwaremainframe.get(1,o),
             		ItemList.Circuit_Wetwaremainframe.get(1,o),
@@ -2348,8 +2383,8 @@ public class GT_MachineRecipeLoader implements Runnable {
                 ItemList.Circuit_Wetwaremainframe.get(1,o),
                 ItemList.ZPM2.get(8,o),
                 ItemList.Field_Generator_UV.get(4,o),
-                ItemList.Circuit_Wafer_HPIC.get(64,o),
-                ItemList.Circuit_Wafer_HPIC.get(64,o),
+                ItemList.Circuit_Wafer_UHPIC.get(64,o),
+                ItemList.Circuit_Wafer_UHPIC.get(64,o),
                 ItemList.Circuit_Wafer_SoC2.get(32,o),
                 ItemList.Circuit_Parts_DiodeSMD.get(64,o),
                 GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 64),