diff --git a/script-factory.iml b/script-factory.iml index 3310b3a..9628ced 100644 --- a/script-factory.iml +++ b/script-factory.iml @@ -15,6 +15,9 @@ + + + diff --git a/src/main/java/scriptfactory/Core.java b/src/main/java/scriptfactory/Core.java index 680c563..81cbdaf 100644 --- a/src/main/java/scriptfactory/Core.java +++ b/src/main/java/scriptfactory/Core.java @@ -21,7 +21,7 @@ import static scriptfactory.VarsMethods.log; * Welcome to AIO AIO - ScriptFactory. Make your own scripts! */ -@ScriptManifest(author = "Before", name = "Script Factory 1.10", category = Category.OTHER, version = 1.10, description = "Create your own scripts!", servers = "All") +@ScriptManifest(author = "Before", name = "Script Factory 1.13", category = Category.OTHER, version = 1.13, description = "Create your own scripts!", servers = "All") public class Core extends Script implements Paintable { private ArrayList actions = new ArrayList<>(); @@ -87,7 +87,7 @@ public class Core extends Script implements Paintable { } g.drawString("Currently Executing:", 9, 270); g.drawString(VarsMethods.currentAction, 9, 290); - g.drawString("EXP(P/H): " + VarsMethods.formatNumber((int) VarsMethods.gainedXP) + "(" + VarsMethods.formatNumber(SCRIPT_TIMER.getPerHour((int) VarsMethods.gainedXP)) + ")", 9, 310); + g.drawString("EXP(P/H): " + VarsMethods.formatNumber((int) VarsMethods.gainedXP) + "(" + VarsMethods.formatNumber(SCRIPT_TIMER.getPerHour(VarsMethods.gainedXP)) + ")", 9, 310); g.drawString("Runtime: " + SCRIPT_TIMER.toString(), 9, 330); } catch (Exception e) { log("Paint Error"); diff --git a/src/main/java/scriptfactory/VarsMethods.java b/src/main/java/scriptfactory/VarsMethods.java index 52493bf..a075d02 100644 --- a/src/main/java/scriptfactory/VarsMethods.java +++ b/src/main/java/scriptfactory/VarsMethods.java @@ -27,6 +27,12 @@ public class VarsMethods { public static void log(String str) { + if (str.toLowerCase().contains("error")) + { + //TODO: Open the logger + //Put it in the paint as well + currentAction = "ERROR (See Logger)"; + } Logger.addMessage(str, false); System.out.println(str); } diff --git a/target/classes/config.xml b/target/classes/config.xml index 6156235..1698320 100644 --- a/target/classes/config.xml +++ b/target/classes/config.xml @@ -1,6 +1,6 @@ - + diff --git a/target/classes/scriptfactory/Core.class b/target/classes/scriptfactory/Core.class index ae42df8..c267610 100644 Binary files a/target/classes/scriptfactory/Core.class and b/target/classes/scriptfactory/Core.class differ diff --git a/target/classes/scriptfactory/VarsMethods.class b/target/classes/scriptfactory/VarsMethods.class index 3f08e5d..40b130c 100644 Binary files a/target/classes/scriptfactory/VarsMethods.class and b/target/classes/scriptfactory/VarsMethods.class differ