diff options
author | YoungGT <noonpp44895@qq.com> | 2017-11-27 22:43:50 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-27 22:43:50 +0800 |
commit | 34f885071acedc01ab8a7ab69239f15dec75d58a (patch) | |
tree | 7959da57d2f18823c35c503248258d015e4e99df | |
parent | df081bd0a7fecbf82bc8309454e9fc1495042bb3 (diff) | |
download | GT5-Unofficial-34f885071acedc01ab8a7ab69239f15dec75d58a.tar.gz GT5-Unofficial-34f885071acedc01ab8a7ab69239f15dec75d58a.tar.bz2 GT5-Unofficial-34f885071acedc01ab8a7ab69239f15dec75d58a.zip |
Fix a bug about achievements
We can find that there's always two achievements between "As Dense As Possible" and "What now?" whether you opened the batteries or not,so this PR would like to fix this.
-rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_Achievements.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 00a1d68784..5c73296a77 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -7,6 +7,7 @@ import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent; import gregtech.GT_Mod; import gregtech.api.GregTech_API; +import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -207,9 +208,14 @@ 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("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(GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", 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); + }else { + registerAchievement("whatnow", 8, 10, ItemList.ZPM2.get(1, new Object[]{}), "denseaspossible", false); + } + // if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){ // for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) { @@ -643,4 +649,4 @@ public class GT_Achievements { } } } -}
\ No newline at end of file +} |