variety of minor fixes

DenizenScript · Feb 21, 2022 · a3ee8ab · a3ee8ab
1 parent 69e5b56
commit a3ee8ab
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 22 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java
@@ -1151,7 +1151,7 @@ else if (comparedto.startsWith("material_flagged:")) {
     }
 
     public static boolean tryEntity(EntityTag entity, String comparedto) {
-        if (comparedto == null || comparedto.isEmpty() || entity == null) {
+        if (entity == null) {
             return false;
         }
         return entity.tryAdvancedMatcher(comparedto);

diff --git a/...n/java/com/denizenscript/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java b/...n/java/com/denizenscript/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java
@@ -26,7 +26,7 @@ public class PlayerCompletesAdvancementScriptEvent extends BukkitScriptEvent imp
     //
     // @Context
     // <context.criteria> returns all the criteria present in this advancement.
-    // <context.advancement> returns the name of advancement completed.
+    // <context.advancement> returns the completed advancement's minecraft ID key.
     //
     // @Player Always.
     //

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/BiomeTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/BiomeTag.java
@@ -284,7 +284,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
 
     @Override
     public void applyProperty(Mechanism mechanism) {
-        Debug.echoError("Cannot apply properties to a biome!");
+        mechanism.echoError("Cannot apply properties to a biome!");
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java
@@ -694,7 +694,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
     }
 
     public void applyProperty(Mechanism mechanism) {
-        Debug.echoError("Cannot apply properties to a chunk!");
+        mechanism.echoError("Cannot apply properties to a chunk!");
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java
@@ -1511,7 +1511,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
 
     public void applyProperty(Mechanism mechanism) {
         if (NoteManager.isExactSavedObject(this)) {
-            Debug.echoError("Cannot apply properties to noted objects.");
+            mechanism.echoError("Cannot apply properties to noted objects.");
             return;
         }
         adjust(mechanism);

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -465,6 +465,9 @@ else if (text.startsWith("npc_flagged:")) {
     }
 
     public final boolean tryAdvancedMatcher(String text) {
+        if (text == null || text.isEmpty()) {
+            return false;
+        }
         ScriptEvent.MatchHelper matcher = ScriptEvent.createMatcher(CoreUtilities.toLowerCase(text));
         if (isCitizensNPC()) {
             return matcher.doesMatch("npc", this::tryExactMatcher);
@@ -3011,7 +3014,7 @@ public void applyProperty(Mechanism mechanism) {
             mechanism.fulfill();
         }
         else {
-            Debug.echoError("Cannot apply properties to an already-spawned entity!");
+            mechanism.echoError("Cannot apply properties to an already-spawned entity!");
         }
     }
 
@@ -3026,10 +3029,10 @@ public void adjust(Mechanism mechanism) {
 
         if (getBukkitEntity() == null) {
             if (isCitizensNPC()) {
-                Debug.echoError("Cannot adjust not-spawned NPC " + getDenizenNPC());
+                mechanism.echoError("Cannot adjust not-spawned NPC " + getDenizenNPC());
             }
             else {
-                Debug.echoError("Cannot adjust entity " + this);
+                mechanism.echoError("Cannot adjust entity " + this);
             }
             return;
         }
@@ -4049,6 +4052,6 @@ else if (getBukkitEntity() instanceof Creeper) {
 
     @Override
     public boolean advancedMatches(String matcher) {
-        return BukkitScriptEvent.tryEntity(this, matcher);
+        return tryAdvancedMatcher(matcher);
     }
 }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java
@@ -2330,7 +2330,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
     }
 
     public void applyProperty(Mechanism mechanism) {
-        Debug.echoError("Cannot apply properties to non-generic inventory!");
+        mechanism.echoError("Cannot apply properties to non-generic inventory!");
     }
 
     @Override
@@ -2349,7 +2349,7 @@ public void adjust(Mechanism mechanism) {
         // -->
         if (mechanism.matches("matrix") && mechanism.requireObject(ListTag.class)) {
             if (!(inventory instanceof CraftingInventory)) {
-                Debug.echoError("Inventory is not a crafting inventory, cannot set matrix.");
+                mechanism.echoError("Inventory is not a crafting inventory, cannot set matrix.");
                 return;
             }
             CraftingInventory craftingInventory = (CraftingInventory) inventory;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
@@ -4109,7 +4109,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
     }
 
     public void applyProperty(Mechanism mechanism) {
-        Debug.echoError("Cannot apply properties to a location!");
+        mechanism.echoError("Cannot apply properties to a location!");
     }
 
     @Override
@@ -4129,7 +4129,7 @@ public void adjust(Mechanism mechanism) {
             Block block = getBlock();
             MaterialTag material = new MaterialTag(block);
             if (!MaterialDirectional.describes(material)) {
-                Debug.echoError("LocationTag.block_facing mechanism failed: block is not directional.");
+                mechanism.echoError("LocationTag.block_facing mechanism failed: block is not directional.");
                 return;
             }
             MaterialDirectional.getFrom(material).setFacing(Utilities.faceFor(faceVec.toVector()));

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java
@@ -1277,7 +1277,7 @@ public ObjectTag getNextObjectTypeDown() {
     }
 
     public void applyProperty(Mechanism mechanism) {
-        Debug.echoError("Cannot apply properties to an NPC!");
+        mechanism.echoError("Cannot apply properties to an NPC!");
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
@@ -2501,7 +2501,7 @@ public ObjectTag getNextObjectTypeDown() {
     }
 
     public void applyProperty(Mechanism mechanism) {
-        Debug.echoError("Cannot apply properties to a player!");
+        mechanism.echoError("Cannot apply properties to a player!");
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java
@@ -714,7 +714,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
 
     public void applyProperty(Mechanism mechanism) {
         if (NoteManager.isExactSavedObject(this)) {
-            Debug.echoError("Cannot apply properties to noted objects.");
+            mechanism.echoError("Cannot apply properties to noted objects.");
             return;
         }
         adjust(mechanism);

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java
@@ -924,7 +924,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
     }
 
     public void applyProperty(Mechanism mechanism) {
-        Debug.echoError("Cannot apply properties to a world!");
+        mechanism.echoError("Cannot apply properties to a world!");
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/TextWidthHelper.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/TextWidthHelper.java
@@ -32,9 +32,13 @@ public static int getWidth(char c) {
     public static AsciiMatcher formatCharCodeMatcher = new AsciiMatcher("klmnoKLMNO");
 
     public static int getWidth(String str) {
+        return getWidth(false, str);
+    }
+
+    public static int getWidth(boolean wasBold, String str) {
         int maxWidth = 0;
         int total = 0;
-        boolean bold = false;
+        boolean bold = wasBold;
         char[] rawChars = str.toCharArray();
         for (int i = 0; i < rawChars.length; i++) {
             char c = rawChars[i];
@@ -94,14 +98,18 @@ public static String splitLines(String str, int width) {
         mainloop:
         for (int i = 0; i < str.length(); i++) {
             char c = str.charAt(i);
+            if (c == ChatColor.COLOR_CHAR) {
+                i++;
+                continue;
+            }
             if (c == '\n') {
                 String lastLine = str.substring(lineStart, i + 1);
                 bold = isBold(bold, lastLine);
                 output.append(lastLine);
                 lineStart = i + 1;
                 continue;
             }
-            if (getWidth(((bold ? ChatColor.BOLD.toString() : "") + str.substring(lineStart, i))) > width) {
+            if (getWidth(bold, str.substring(lineStart, i)) > width) {
                 for (int x = i - 1; x > lineStart; x--) {
                     char xc = str.charAt(x);
                     if (xc == ' ') {

diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml
@@ -54,9 +54,6 @@ Scripts:
     Queue speed: instant
   # Default speed for new queues (via run command usually)
   Queue speed: instant
-  Scripts location:
-    Use default script folder: true
-    Alternative folder path: 'plugins/Denizen'
   # What character encoding to use. 'default' indicates system default, 'utf8' is suggested as a preferred encoding in most cases.
   Encoding: utf8
   Command: