Merge branch 'experimental' into eM

1 files changed, 9 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 1d0afd72d6..60cba6c9e3 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;
@@ -71,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)
@@ -213,6 +220,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)) 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});
     }