From af9627467b36837e513f36894080a377fcedb5ab Mon Sep 17 00:00:00 2001 From: dginovker Date: Fri, 13 Dec 2019 14:37:42 -0500 Subject: [PATCH] Added ERROR to paint if something went wrong --- script-factory.iml | 3 +++ src/main/java/scriptfactory/Core.java | 4 ++-- src/main/java/scriptfactory/VarsMethods.java | 6 ++++++ target/classes/config.xml | 2 +- target/classes/scriptfactory/Core.class | Bin 3765 -> 3765 bytes .../classes/scriptfactory/VarsMethods.class | Bin 8599 -> 8743 bytes 6 files changed, 12 insertions(+), 3 deletions(-) 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 ae42df88044cd7772e4b57863b654cc3bbf5a8cc..c267610036a07f0a7025611f63ddb0631e5eb67e 100644 GIT binary patch delta 26 icmdlgyH$3B6APp9WM>v1_D>>J58c;^Y@Ws<&jkQ_mk8Vd delta 26 fcmdlgyH$3B6APokWM>v1_K!0`VAkeoEb?3cgWC!B diff --git a/target/classes/scriptfactory/VarsMethods.class b/target/classes/scriptfactory/VarsMethods.class index 3f08e5d908cc14f458447ebb6d1c5c4b26db5460..40b130cb00c99a9bcdf30ed4eb65076fe8f5f320 100644 GIT binary patch literal 8743 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