From 8b879e98b45eb71d1418a0d793cb2ea470777e05 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 28 Jan 2017 13:58:47 +0100 Subject: Add logger --- src/main/java/gregtech/loaders/misc/GT_Achievements.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/loaders/misc/GT_Achievements.java') diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 1d0afd72d6..b11e98fc34 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -212,7 +212,8 @@ 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) { - oreList.add(aMaterial); + //oreList.add(aMaterial); + if(!oreList.add(aMaterial)) GT_Log.err.println("GT Achievement - Ore with that (" + aMaterial.name() + ") material already exists."); } oreStats.add(new Integer[]{min, max, chance, overworld ? 1 : 0, nether ? 1 : 0, end ? 1 : 0}); } -- cgit From a5a544c9a4e32f9df0cdfcf8b9c74f2974342775 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 28 Jan 2017 14:38:09 +0100 Subject: Make the game crash on wrong config tho. --- src/main/java/gregtech/loaders/misc/GT_Achievements.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/loaders/misc/GT_Achievements.java') diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index b11e98fc34..20b3e9d985 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -18,6 +18,8 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.common.items.GT_MetaGenerated_Tool_01; import ic2.core.Ic2Items; +import net.minecraft.client.Minecraft; +import net.minecraft.crash.CrashReport; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -213,7 +215,7 @@ 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) { //oreList.add(aMaterial); - if(!oreList.add(aMaterial)) GT_Log.err.println("GT Achievement - Ore with that (" + aMaterial.name() + ") material already exists."); + 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}); } -- cgit From f548a490264c36875ca041133c8f0cb5ea010da0 Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 29 Jan 2017 09:43:16 +0100 Subject: not needed --- src/main/java/gregtech/loaders/misc/GT_Achievements.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/loaders/misc/GT_Achievements.java') diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 20b3e9d985..502be8df3b 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -214,8 +214,8 @@ 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) { - //oreList.add(aMaterial); - if(!oreList.add(aMaterial)) Minecraft.getMinecraft().crashed(new CrashReport("GT Achievement - Ore with that (" + aMaterial.name() + ") material already exists.",new IllegalArgumentException())); + 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}); } -- cgit From fac3fa7301e6509fb41897fa1659f11ef9d07d67 Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 29 Jan 2017 09:50:40 +0100 Subject: this should find it? --- src/main/java/gregtech/loaders/misc/GT_Achievements.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/loaders/misc/GT_Achievements.java') diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 502be8df3b..60cba6c9e3 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -73,7 +73,12 @@ public class GT_Achievements { } GT_Log.out.println("achievement." + oreList.get(i).name() + ".desc=Height: " + (oreStats.get(i)[0]) + "-" + (oreStats.get(i)[1]) + ", Chance: " + (oreStats.get(i)[2]) + ", " + dimensions.toString()); } - registerOreAchievement(oreList.get(i)); + if(oreList.get(i)==null) + GT_Log.out.println("GT Achievement - Ore with NULL pointer material tries to register achievement."); + if(oreList.get(i).name()==null) + GT_Log.out.println("GT Achievement - Ore with NULL named material tries to register achievement."); + else + registerOreAchievement(oreList.get(i)); } for(GT_Recipe recipe: GT_Recipe.GT_Recipe_Map.sAssemblylineFakeRecipes.mRecipeList) -- cgit