From 2f58e593e5a21c850c55cdb5a7de78f21231282e Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Thu, 26 Apr 2012 07:41:00 -0700
Subject: [PATCH] Config overhaul part 2

---
 .../java/com/gmail/nossr50/config/Config.java | 31 +++++++++----------
 .../java/com/gmail/nossr50/skills/Mining.java | 26 ++++++++--------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java
index f8600bdaa..1dd5ac76b 100644
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -90,7 +90,20 @@ public class Config extends ConfigLoader{
     public static Boolean enableCobbleToMossy, enableSmoothToMossy, enableDirtToGrass;
 
     /* Mining */
-    public static int msandstone, mgold, mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack, mglowstone, mcoal, mstone, mendstone, mmossstone;
+    public static int getMiningXPGoldOre() { return config.getInt("Experience.Mining.Gold", 250); } 
+    public static int getMiningXPDiamondOre() { return config.getInt("Experience.Mining.Diamond", 750); }
+    public static int getMiningXPIronOre() { return config.getInt("Experience.Mining.Iron", 250); }
+    public static int getMiningXPRedstoneOre() { return config.getInt("Experience.Mining.Redstone", 150); }
+    public static int getMiningXPLapisOre() { return config.getInt("Experience.Mining.Lapis", 400); }
+    public static int getMiningXPObsidian() { return config.getInt("Experience.Mining.Obsidian", 150); }
+    public static int getMiningXPNetherrack() { return config.getInt("Experience.Mining.Netherrack", 30); }
+    public static int getMiningXPGlowstone() { return config.getInt("Experience.Mining.Glowstone", 30); }
+    public static int getMiningXPCoalOre() { return config.getInt("Experience.Mining.Coal", 100); }
+    public static int getMiningXPStone() { return config.getInt("Experience.Mining.Stone", 30); }
+    public static int getMiningXPSandstone() { return config.getInt("Experience.Mining.Sandstone", 30); }
+    public static int getMiningXPEndStone() { return config.getInt("Experience.Mining.End_Stone", 150); }
+    public static int getMiningXPMossyStone() { return config.getInt("Experience.Mining.Moss_Stone", 30); }
+    
     public static int detonatorID;
 
     /* Repair */
@@ -304,19 +317,7 @@ public class Config extends ConfigLoader{
         mspruce = config.getInt("Experience.Woodcutting.Spruce", 80);
         mjungle = config.getInt("Experience.Woodcutting.Jungle", 100);
 
-        mgold = config.getInt("Experience.Mining.Gold", 250);
-        mdiamond = config.getInt("Experience.Mining.Diamond", 750);
-        miron = config.getInt("Experience.Mining.Iron", 250);
-        mredstone = config.getInt("Experience.Mining.Redstone", 150);
-        mlapis = config.getInt("Experience.Mining.Lapis", 400);
-        mobsidian = config.getInt("Experience.Mining.Obsidian", 150);
-        mnetherrack = config.getInt("Experience.Mining.Netherrack", 30);
-        mglowstone = config.getInt("Experience.Mining.Glowstone", 30);
-        mcoal = config.getInt("Experience.Mining.Coal", 100);
-        mstone = config.getInt("Experience.Mining.Stone", 30);
-        msandstone = config.getInt("Experience.Mining.Sandstone", 30);
-        mendstone = config.getInt("Experience.Mining.End_Stone", 150);
-        mmossstone = config.getInt("Experience.Mining.Moss_Stone", 30);
+        
 
         mtameWolf = config.getInt("Experience.Taming.Animal_Taming.Wolf", 250);
         mtameOcelot = config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500);
@@ -387,8 +388,6 @@ public class Config extends ConfigLoader{
         repairStoneLevel = config.getInt("Skills.Repair.Stone.Level_Required", 0);
         repairStringLevel = config.getInt("Skills.Repair.String.Level_Required", 0);
 
-        
-
         anvilmessages = config.getBoolean("Skills.Repair.Anvil_Messages", true);
         anvilID = config.getInt("Skills.Repair.Anvil_ID", 42);
 
diff --git a/src/main/java/com/gmail/nossr50/skills/Mining.java b/src/main/java/com/gmail/nossr50/skills/Mining.java
index a98f072e0..686b3fe50 100644
--- a/src/main/java/com/gmail/nossr50/skills/Mining.java
+++ b/src/main/java/com/gmail/nossr50/skills/Mining.java
@@ -89,56 +89,56 @@ public class Mining {
         
         switch (type) {
         case COAL_ORE:
-            xp += Config.mcoal;
+            xp += Config.getMiningXPCoalOre();
             break;
 
         case DIAMOND_ORE:
-            xp += Config.mdiamond;
+            xp += Config.getMiningXPDiamondOre();
             break;
 
         case ENDER_STONE:
-            xp += Config.mendstone;
+            xp += Config.getMiningXPEndStone();
             break;
 
         case GLOWING_REDSTONE_ORE:
         case REDSTONE_ORE:
-            xp += Config.mredstone;
+            xp += Config.getMiningXPRedstoneOre();
             break;
 
         case GLOWSTONE:
-            xp += Config.mglowstone;
+            xp += Config.getMiningXPGlowstone();
             break;
 
         case GOLD_ORE:
-            xp += Config.mgold;
+            xp += Config.getMiningXPGoldOre();
             break;
 
         case IRON_ORE:
-            xp += Config.miron;
+            xp += Config.getMiningXPIronOre();
             break;
 
         case LAPIS_ORE:
-            xp += Config.mlapis;
+            xp += Config.getMiningXPLapisOre();
             break;
 
         case MOSSY_COBBLESTONE:
-            xp += Config.mmossstone;
+            xp += Config.getMiningXPMossyStone();
             break;
 
         case NETHERRACK:
-            xp += Config.mnetherrack;
+            xp += Config.getMiningXPNetherrack();
             break;
 
         case OBSIDIAN:
-            xp += Config.mobsidian;
+            xp += Config.getMiningXPObsidian();
             break;
 
         case SANDSTONE:
-            xp += Config.msandstone;
+            xp += Config.getMiningXPSandstone();
             break;
 
         case STONE:
-            xp += Config.mstone;
+            xp += Config.getMiningXPStone();
             break;
 
         default: