Initial

Fixed Materials limitation
Added ability to add Materials via a config
Added ability to change all properties of a Material via a config

2 files changed, 19 insertions, 17 deletions

diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index c02743270c..d2b92af91b 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -1,9 +1,5 @@
 package gregtech.loaders.misc;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -33,6 +29,10 @@ import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
 import net.minecraftforge.fluids.FluidStack;
 import thaumcraft.api.ThaumcraftApiHelper;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 public class GT_Achievements {
 
     public static List<Materials> oreList = new ArrayList<Materials>();
@@ -47,8 +47,8 @@ public class GT_Achievements {
         this.achievementList = new HashMap();
         this.issuedAchievements = new HashMap();
         for (int i = 0; i < oreList.size(); i++) {
-            if (GT_Values.D1 && this.achievementList.get(oreList.get(i).name()) == null) {
-                GT_Log.out.println("achievement." + oreList.get(i).name() + "=Find " + oreList.get(i).name() + " Ore");
+            if (GT_Values.D1 && this.achievementList.get(oreList.get(i).mName) == null) {
+                GT_Log.out.println("achievement." + oreList.get(i).mName + "=Find " + oreList.get(i).mName + " Ore");
 
                 StringBuilder dimensions = new StringBuilder();
                 boolean isFirst = true;
@@ -66,7 +66,7 @@ public class GT_Achievements {
                     dimensions.append("End");
                     isFirst = false;
                 }
-                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());
+                GT_Log.out.println("achievement." + oreList.get(i).mName + ".desc=Height: " + (oreStats.get(i)[0]) + "-" + (oreStats.get(i)[1]) + ", Chance: " + (oreStats.get(i)[2]) + ", " + dimensions.toString());
             }
             registerOreAchievement(oreList.get(i));
         }
@@ -249,9 +249,9 @@ public class GT_Achievements {
     }
 
     public Achievement registerOreAchievement(Materials aMaterial) {
-        if (this.achievementList.get(aMaterial.name()) == null) {
+        if (this.achievementList.get(aMaterial.mName) == null) {
             oreReg++;
-            return registerAchievement(aMaterial.name(), -(6 + oreReg % 5), ((oreReg) / 5) - 8, new ItemStack(GregTech_API.sBlockOres1, 1,
+            return registerAchievement(aMaterial.mName, -(6 + oreReg % 5), ((oreReg) / 5) - 8, new ItemStack(GregTech_API.sBlockOres1, 1,
                     aMaterial.mMetaItemSubID), AchievementList.openInventory, false);
         }
         return null;
@@ -498,7 +498,7 @@ public class GT_Achievements {
             } else if (data.mPrefix == OrePrefixes.ore || data.mPrefix == OrePrefixes.oreBlackgranite || data.mPrefix == OrePrefixes.oreEndstone
                     || data.mPrefix == OrePrefixes.oreNetherrack || data.mPrefix == OrePrefixes.oreRedgranite) {
                 for (int i = 0; i < data.getAllMaterialStacks().size(); i++) {
-                    issueAchievement(player, data.getAllMaterialStacks().get(i).mMaterial.name());
+                    issueAchievement(player, data.getAllMaterialStacks().get(i).mMaterial.mName);
                     if (data.getAllMaterialStacks().get(i).mMaterial == Materials.AnyIron) {
                         issueAchievement(player, "iron");
                     }
diff --git a/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java b/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java
index cafde84836..b0593037bf 100644
--- a/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java
+++ b/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java
@@ -1,13 +1,13 @@
 package gregtech.loaders.misc;
 
-import java.io.File;
-import java.util.HashMap;
-
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 
+import java.io.File;
+import java.util.HashMap;
+
 public class OreProcessingConfiguration
     implements Runnable
 {
@@ -31,7 +31,7 @@ public class OreProcessingConfiguration
         {
             if (tMaterial != null && tMaterial != Materials._NULL)
             {
-                String tMaterialName = tMaterial.name();
+                String tMaterialName = tMaterial.mName;
                 boolean tDefaultValue = (tMaterial.mTypes & 8) != 0;
                 Property tProperty =
                     this.mConfiguration.get("processores", tMaterialName + "_" + tDefaultValue, tDefaultValue);
@@ -42,7 +42,8 @@ public class OreProcessingConfiguration
     @Override
     public void run()
     {
-        for (String tMaterialName : this.mEnabledMaterials.keySet())
+        //TODO Reimplement
+        /*for (String tMaterialName : this.mEnabledMaterials.keySet())
         {
             if (this.mEnabledMaterials.get(tMaterialName))
             {
@@ -50,9 +51,10 @@ public class OreProcessingConfiguration
             }
             else if ((Materials.valueOf(tMaterialName).mTypes & 8) != 0)
             {
-                Materials.valueOf(tMaterialName).mTypes ^= 8;
+                Materials.VALUES.valueOf(tMaterialName).mTypes ^= 8;
             }
-        }
+            Materials.VALUES.
+        }*/
     }
 }