aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/misc
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-09-03 14:38:59 +0200
committerGitHub <noreply@github.com>2017-09-03 14:38:59 +0200
commit2555acf75f81d11bde858a801fd37c35978f66dd (patch)
tree24ddac72b8849365f8b8b43c8d7503339b60b49a /src/main/java/gregtech/loaders/misc
parentf94d61a3d27f34555c5ccc1171501e1b768be4aa (diff)
parent820b335d831f60e1936c462d0cb8e7dba3c13fae (diff)
downloadGT5-Unofficial-2555acf75f81d11bde858a801fd37c35978f66dd.tar.gz
GT5-Unofficial-2555acf75f81d11bde858a801fd37c35978f66dd.tar.bz2
GT5-Unofficial-2555acf75f81d11bde858a801fd37c35978f66dd.zip
Merge pull request #1147 from SLiMylya/addnewbattery
Add new zpm and uv battery
Diffstat (limited to 'src/main/java/gregtech/loaders/misc')
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java12
1 files changed, 11 insertions, 1 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");