Merge pull request #117 from GTNewHorizons/OreAchievement_fix

Ore achievement fix

2 files changed, 9 insertions, 8 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index 0294889b06..1a60ce2bef 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -150,6 +150,7 @@ public class GT_MetaTileEntity_Scanner
                         return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;

                     return 2;

                 }

+                

             }

             if (getSpecialSlot() == null && ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) {

                 if (GT_Utility.ItemNBT.getBookTitle(aStack).equals("Raw Prospection Data")) {

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++;