diff --git a/src/main/java/scriptfactory/Actions/ActionHandler.java b/src/main/java/scriptfactory/Actions/ActionHandler.java index c5a83aa..8f5913f 100644 --- a/src/main/java/scriptfactory/Actions/ActionHandler.java +++ b/src/main/java/scriptfactory/Actions/ActionHandler.java @@ -48,10 +48,9 @@ public class ActionHandler { public void useItemOn(Action a) { - Item toUse = Inventory.getItem(parsePint(a.getParamAsString(0))); - Menu.interact(toUse, VarsMethods.getItemOption(a.getParamAsString(1))); - - interactWithEntity(new int[]{a.getParam(1)}, "1"); + Inventory.getItem(a.getParam(0)).interact(Items.Option.USE); + SceneObject object = SceneObjects.getClosest(a.getParam(1)); + Menu.sendAction(a.getParam(2), object.getHash(), object.getLocalRegionX(), object.getLocalRegionY(), object.getId(), 1); } public void type(Action a) diff --git a/src/main/java/scriptfactory/NewGuis/ActionGuiInfo.java b/src/main/java/scriptfactory/NewGuis/ActionGuiInfo.java index e90a0b5..22d3f24 100644 --- a/src/main/java/scriptfactory/NewGuis/ActionGuiInfo.java +++ b/src/main/java/scriptfactory/NewGuis/ActionGuiInfo.java @@ -19,7 +19,7 @@ public class ActionGuiInfo extends NewStatementGUI { new Descriptions("X-tile coordinate", "Y-tile coordinate", "Time (ms) to wait after walking"), new Descriptions("Item to take (eg. 526 picks up bones)"), new Descriptions("Item in your inventory to use (eg. 951 = \"Silk\")", "Option to select (eg. 1 might be \"eat\")"), - new Descriptions("Item in your inventory to use (eg. 999 = \"Bones\")", "Entity to use it on (eg. 999 = altar)<999 isn't actually altar>", "Item option to select (i.e. \"Use\") (cAsE sEnSiTiVe)"), + new Descriptions("Item in your inventory to use (eg. 2352 = \"Iron Bar\")", "Entity to use it on (eg. 2783 = Anvil)", "Interact index to use (eg. 62 = Use with)"), new Descriptions("Text to type in (eg. 28)", "Hit enter? (0 for no, 1 for yes)"), new Descriptions("X coordinate to click (eg. 0)", "Y coordinate to click (eg. 600)", "Click type? (0 for left, 1 for right)"), new Descriptions("Amount of time to sleep (ms)"), diff --git a/src/main/java/scriptfactory/Strategies/ActionExecutor.java b/src/main/java/scriptfactory/Strategies/ActionExecutor.java index 565c4a3..9b92193 100644 --- a/src/main/java/scriptfactory/Strategies/ActionExecutor.java +++ b/src/main/java/scriptfactory/Strategies/ActionExecutor.java @@ -76,7 +76,7 @@ public class ActionExecutor { } else { - switch (action.getMethod().replace("-", " ")) + switch (action.getMethod().replace("-", " ").trim()) { case "Interact with entity by ID": actionHandler.handleInteractWith(action); diff --git a/src/main/java/scriptfactory/VarsMethods.java b/src/main/java/scriptfactory/VarsMethods.java index 47b1d97..52493bf 100644 --- a/src/main/java/scriptfactory/VarsMethods.java +++ b/src/main/java/scriptfactory/VarsMethods.java @@ -36,6 +36,7 @@ public class VarsMethods { try (BufferedReader br = new BufferedReader(new FileReader(selectedFile))) { String line; while ((line = br.readLine()) != null) { + line = line.trim(); switch (line.split(" ")[0]) { case "If": diff --git a/target/classes/scriptfactory/Actions/ActionHandler$1.class b/target/classes/scriptfactory/Actions/ActionHandler$1.class index 02fa2af..3bec4e6 100644 Binary files a/target/classes/scriptfactory/Actions/ActionHandler$1.class and b/target/classes/scriptfactory/Actions/ActionHandler$1.class differ diff --git a/target/classes/scriptfactory/Actions/ActionHandler$2.class b/target/classes/scriptfactory/Actions/ActionHandler$2.class index 1384dd9..2e344c5 100644 Binary files a/target/classes/scriptfactory/Actions/ActionHandler$2.class and b/target/classes/scriptfactory/Actions/ActionHandler$2.class differ diff --git a/target/classes/scriptfactory/Actions/ActionHandler$3.class b/target/classes/scriptfactory/Actions/ActionHandler$3.class index 560548b..33f1129 100644 Binary files a/target/classes/scriptfactory/Actions/ActionHandler$3.class and b/target/classes/scriptfactory/Actions/ActionHandler$3.class differ diff --git a/target/classes/scriptfactory/Actions/ActionHandler$4.class b/target/classes/scriptfactory/Actions/ActionHandler$4.class index 9b80ee5..151cd31 100644 Binary files a/target/classes/scriptfactory/Actions/ActionHandler$4.class and b/target/classes/scriptfactory/Actions/ActionHandler$4.class differ diff --git a/target/classes/scriptfactory/Actions/ActionHandler.class b/target/classes/scriptfactory/Actions/ActionHandler.class index a07a1b8..f91af84 100644 Binary files a/target/classes/scriptfactory/Actions/ActionHandler.class and b/target/classes/scriptfactory/Actions/ActionHandler.class differ diff --git a/target/classes/scriptfactory/NewGuis/ActionGuiInfo.class b/target/classes/scriptfactory/NewGuis/ActionGuiInfo.class index 6d9ac3e..9c7d74e 100644 Binary files a/target/classes/scriptfactory/NewGuis/ActionGuiInfo.class and b/target/classes/scriptfactory/NewGuis/ActionGuiInfo.class differ diff --git a/target/classes/scriptfactory/Strategies/ActionExecutor.class b/target/classes/scriptfactory/Strategies/ActionExecutor.class index 96633da..dbccecd 100644 Binary files a/target/classes/scriptfactory/Strategies/ActionExecutor.class and b/target/classes/scriptfactory/Strategies/ActionExecutor.class differ diff --git a/target/classes/scriptfactory/VarsMethods.class b/target/classes/scriptfactory/VarsMethods.class index d7c94b0..3f08e5d 100644 Binary files a/target/classes/scriptfactory/VarsMethods.class and b/target/classes/scriptfactory/VarsMethods.class differ