From 0117b7471f8899f57c3e123bdc785f5c51f3793f Mon Sep 17 00:00:00 2001
From: JKetelaar <jeroen@ketelaar.me>
Date: Thu, 30 Oct 2014 01:01:14 +0100
Subject: [PATCH] Fixed skills indexes

---
 src/org/rev317/min/Loader.java            | 20 ++++++++++++++------
 src/org/rev317/min/api/methods/Game.java  |  2 +-
 src/org/rev317/min/api/methods/Skill.java |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/org/rev317/min/Loader.java b/src/org/rev317/min/Loader.java
index b87e736..3f16ed8 100644
--- a/src/org/rev317/min/Loader.java
+++ b/src/org/rev317/min/Loader.java
@@ -1,6 +1,7 @@
 package org.rev317.min;
 
 import org.parabot.core.Context;
+import org.parabot.core.Core;
 import org.parabot.core.Directories;
 import org.parabot.core.asm.ASMClassLoader;
 import org.parabot.core.asm.adapters.AddInterfaceAdapter;
@@ -22,10 +23,11 @@ import java.io.File;
 import java.net.URL;
 
 /**
- * @author Everel, Paradox
+ * @author Everel, JKetelaar
  */
-@ServerManifest(author = "Everel & Paradox", name = "Server name here", type = Type.INJECTION, version = 2.1)
+@ServerManifest(author = "Everel & JKetelaar", name = "Server name here", type = Type.INJECTION, version = 2.1)
 public class Loader extends ServerProvider {
+    private boolean extended = true;
     //private HookFile hookFile = new HookFile(Context.getInstance().getServerProviderInfo().getExtendedHookFile(), HookFile.TYPE_XML);
     //private HookFile hookFile = new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML);
 
@@ -70,9 +72,11 @@ public class Loader extends ServerProvider {
         try {
             super.injectHooks();
         } catch (Exception e) {
-            e.printStackTrace();
-            //this.hookFile = new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML);
-            //super.injectHooks();
+            if (Core.inVerboseMode()){
+                e.printStackTrace();
+            }
+            this.extended = false;
+            super.injectHooks();
         }
     }
 
@@ -84,7 +88,11 @@ public class Loader extends ServerProvider {
 
     @Override
     public HookFile getHookFile() {
-        return new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML);
+        if (this.extended){
+            return new HookFile(Context.getInstance().getServerProviderInfo().getExtendedHookFile(), HookFile.TYPE_XML);
+        }else{
+            return new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML);
+        }
     }
 
     public void unloadScript(Script script) {
diff --git a/src/org/rev317/min/api/methods/Game.java b/src/org/rev317/min/api/methods/Game.java
index ee9c6fc..c162fe6 100644
--- a/src/org/rev317/min/api/methods/Game.java
+++ b/src/org/rev317/min/api/methods/Game.java
@@ -3,7 +3,7 @@ package org.rev317.min.api.methods;
 import org.rev317.min.Loader;
 
 /**
- * @author Everel
+ * @author Everel, JKetelaar
  */
 public class Game {
 
diff --git a/src/org/rev317/min/api/methods/Skill.java b/src/org/rev317/min/api/methods/Skill.java
index 5b4d818..ca3d894 100644
--- a/src/org/rev317/min/api/methods/Skill.java
+++ b/src/org/rev317/min/api/methods/Skill.java
@@ -7,7 +7,7 @@ import org.rev317.min.Loader;
  */
 public enum Skill {
 
-    ATTACK, DEFENSE, STRENGTH, HITPOINTS, CONSTITUTION, RANGE, PRAYER, MAGIC, COOKING, WOODCUTTING, FLETCHING, FISHING, FIREMAKING, CRAFTING, SMITHING, MINING, HERBLORE, HERBLAW, AGILITY, THIEVING, SLAYER, FARMING, RUNECRAFTING, HUNTER, CONSTRUCTION, SUMMONING, DUNGEONEERING;
+    ATTACK, DEFENSE, STRENGTH, HITPOINTS, RANGE, PRAYER, MAGIC, COOKING, WOODCUTTING, FLETCHING, FISHING, FIREMAKING, CRAFTING, SMITHING, MINING, HERBLORE, AGILITY, THIEVING, SLAYER, FARMING, RUNECRAFTING, CONSTRUCTION, HUNTER, SUMMONING, DUNGEONEERING;
 
     private static final int[] EXPERIENCE = {0, 0, 83, 174, 276, 388, 512,
             650, 801, 969, 1154, 1358, 1584, 1833, 2107, 2411, 2746, 3115,