Reverted methods and made them deprecated

src/org/rev317/min/api/methods/Npcs.java

@@ -151,16 +151,23 @@ public class Npcs {
         SECOND(Integer.parseInt(settings.getProperty("menu_character_second_interaction"))),
         TALK_TO(Integer.parseInt(settings.getProperty("menu_character_second_interaction"))),
         INTERACT(Integer.parseInt(settings.getProperty("menu_character_second_interaction"))),
+        BAIT(Integer.parseInt(settings.getProperty("menu_character_second_interaction"))),
+        CAGE(Integer.parseInt(settings.getProperty("menu_character_second_interaction"))),
+        NET(Integer.parseInt(settings.getProperty("menu_character_second_interaction"))),
 
         THIRD(Integer.parseInt(settings.getProperty("menu_character_third_interaction"))),
         TRADE(Integer.parseInt(settings.getProperty("menu_character_third_interaction"))),
         BANK(Integer.parseInt(settings.getProperty("menu_character_third_interaction"))),
         PICKPOCKET(Integer.parseInt(settings.getProperty("menu_character_third_interaction"))),
+        HARPOON(Integer.parseInt(settings.getProperty("menu_character_third_interaction"))),
+        GET_TASK(Integer.parseInt(settings.getProperty("menu_character_third_interaction"))),
 
         FOURTH(Integer.parseInt(settings.getProperty("menu_character_fourth_interaction"))),
         COLLECT(Integer.parseInt(settings.getProperty("menu_character_fourth_interaction"))),
+        CHANGE_CLOTHES(Integer.parseInt(settings.getProperty("menu_character_fourth_interaction"))),
 
         FIFTH(Integer.parseInt(settings.getProperty("menu_character_fifth_interaction"))),
+        REWARD(Integer.parseInt(settings.getProperty("menu_character_fifth_interaction"))),
 
         EXAMINE(Integer.parseInt(settings.getProperty("menu_character_examine")));
 

src/org/rev317/min/api/methods/Players.java

@@ -113,7 +113,7 @@ public class Players {
 
         ATTACK(Integer.parseInt(settings.getProperty("menu_character_attack"))),
         CHALLENGE(Integer.parseInt(settings.getProperty("menu_character_attack"))),
-        
+
         EXAMINE(Integer.parseInt(settings.getProperty("menu_character_examine")));
 
         int actionId;

src/org/rev317/min/api/methods/SceneObjects.java

@@ -233,16 +233,20 @@ public class SceneObjects {
         DEPOSIT(Integer.parseInt(settings.getProperty("menu_scene_object_first_interaction"))),
         USE(Integer.parseInt(settings.getProperty("menu_scene_object_first_interaction"))),
         SEARCH(Integer.parseInt(settings.getProperty("menu_scene_object_first_interaction"))),
+        CLOSE(Integer.parseInt(settings.getProperty("menu_scene_object_first_interaction"))),
+        CROSS(Integer.parseInt(settings.getProperty("menu_scene_object_first_interaction"))),
 
         SECOND(Integer.parseInt(settings.getProperty("menu_scene_object_second_interaction"))),
         TELEPORT(Integer.parseInt(settings.getProperty("menu_scene_object_second_interaction"))),
         STEAL_FROM(Integer.parseInt(settings.getProperty("menu_scene_object_second_interaction"))),
         PRAY(Integer.parseInt(settings.getProperty("menu_scene_object_second_interaction"))),
         USE_QUICKLY(Integer.parseInt(settings.getProperty("menu_scene_object_second_interaction"))),
+        INSPECT(Integer.parseInt(settings.getProperty("menu_scene_object_second_interaction"))),
 
         THIRD(Integer.parseInt(settings.getProperty("menu_scene_object_third_interaction"))),
 
         FOURTH(Integer.parseInt(settings.getProperty("menu_scene_object_fourth_interaction"))),
+        GUIDE(Integer.parseInt(settings.getProperty("menu_scene_object_fourth_interaction"))),
 
         FIFTH(Integer.parseInt(settings.getProperty("menu_scene_object_fifth_interaction"))),
 

src/org/rev317/min/api/wrappers/Character.java

@@ -5,6 +5,7 @@ import org.rev317.min.Loader;
 import org.rev317.min.api.interfaces.Locatable;
 import org.rev317.min.api.methods.Calculations;
 import org.rev317.min.api.methods.Game;
+import org.rev317.min.api.methods.Menu;
 import org.rev317.min.api.methods.Players;
 
 /**
@@ -111,6 +112,17 @@ public class Character implements Locatable {
                 .getLoopCycle();
     }
 
+    /**
+     * Interacts with this character
+     *
+     * @deprecated
+     *
+     * @param i
+     */
+    public void interact(int i) {
+        Menu.interact(this, i);
+    }
+
     /**
      * Returns the character this character is interacting with
      *

src/org/rev317/min/api/wrappers/GroundItem.java

@@ -51,7 +51,18 @@ public class GroundItem implements Locatable {
      * @param option
      */
     public void interact(GroundItems.Option option) {
-        Menu.interact(this, option.getActionId());
+        Menu.interact(this, option);
+    }
+
+    /**
+     * Interacts with this ground item
+     *
+     * @deprecated
+     *
+     * @param actionIndex
+     */
+    public void interact(int actionIndex) {
+        Menu.interact(this, actionIndex);
     }
 
     /**

src/org/rev317/min/api/wrappers/Item.java

@@ -56,7 +56,7 @@ public class Item {
      * @param option
      */
     public void interact(Items.Option option) {
-        Menu.interact(this, option.getActionId());
+        Menu.interact(this, option);
     }
 
     /**
@@ -65,7 +65,38 @@ public class Item {
      * @param interfaceParentId
      */
     public void transform(Items.Option option, int interfaceParentId) {
-        Menu.transformItem(this, option.getActionId(), interfaceParentId);
+        Menu.transformItem(this, option, interfaceParentId);
     }
 
+    /**
+     * Interacts with this item
+     *
+     * @deprecated
+     *
+     * @param i
+     */
+    public void interact(int i) {
+        Menu.interact(this, i);
+    }
+
+    /**
+     * Interacts with this item
+     *
+     * @deprecated
+     *
+     * @param s
+     */
+    public void interact(String s){
+        Menu.interact(this, s);
+    }
+
+    /**
+     * @deprecated
+     *
+     * @param actionIndex
+     * @param interfaceParentId
+     */
+    public void transform(int actionIndex, int interfaceParentId) {
+        Menu.transformItem(this, actionIndex, interfaceParentId);
+    }
 }

src/org/rev317/min/api/wrappers/SceneObject.java

@@ -95,7 +95,18 @@ public class SceneObject implements Locatable {
      * @param option
      */
     public void interact(SceneObjects.Option option) {
-        Menu.interact(this, option.getActionId());
+        Menu.interact(this, option);
+    }
+
+    /**
+     * Interacts with this object
+     *
+     * @deprecated
+     *
+     * @param actionIndex
+     */
+    public void interact(int actionIndex) {
+        Menu.interact(this, actionIndex);
     }
 
     /**