From a69dfe40d0088f5ca539ecb3e67a513aab8d2313 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Mon, 7 May 2018 15:23:46 +0200 Subject: fake re-enabled OreAchievements for compability purposes --- src/main/java/gregtech/loaders/misc/GT_Achievements.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 6a9481492c..fe9cde5f62 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -231,13 +231,13 @@ public class GT_Achievements { } } - /*public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) { - if (aMaterial != Materials._NULL) { + public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) { + /*if (aMaterial != Materials._NULL) { oreList.add(aMaterial); //if(!oreList.add(aMaterial)) Minecraft.getMinecraft().crashed(new CrashReport("GT Achievement - Ore with that (" + aMaterial.name() + ") material already exists.",new IllegalArgumentException())); } - oreStats.add(new Integer[]{min, max, chance, overworld ? 1 : 0, nether ? 1 : 0, end ? 1 : 0}); - }*/ + oreStats.add(new Integer[]{min, max, chance, overworld ? 1 : 0, nether ? 1 : 0, end ? 1 : 0});*/ + } public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) { if (!GT_Mod.gregtechproxy.mAchievements) { @@ -274,16 +274,16 @@ public class GT_Achievements { return achievement; } - /*public Achievement registerOreAchievement(Materials aMaterial) { - + public Achievement registerOreAchievement(Materials aMaterial) { + /* if (this.achievementList.get(aMaterial.mName) == null) { oreReg++; return registerAchievement(aMaterial.mName, -(6 + oreReg % 5), ((oreReg) / 5) - 8, new ItemStack(GregTech_API.sBlockOres1, 1, aMaterial.mMetaItemSubID), AchievementList.openInventory, false); - } + }*/ return null; } -*/ + public Achievement registerAssAchievement(GT_Recipe recipe) { if (this.achievementList.get(recipe.getOutput(0).getUnlocalizedName()) == null) { assReg++; -- cgit