debug format enhancement impl

DenizenScript · Jan 1, 2022 · 315be97 · 315be97
1 parent 3772167
commit 315be97
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 10 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -51,6 +51,7 @@
 
 import java.util.*;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 public class EntityTag implements ObjectTag, Adjustable, EntityFormObject, FlaggableObject, Cloneable {
 
@@ -1121,13 +1122,13 @@ public String debuggable() {
                 return getDenizenPlayer().debuggable();
             }
             else if (isFake) {
-                return "e@FAKE: " + getUUID() + "<GR>(FAKE-" + entity.getType().name() + "/" + entity.getName() + ")";
+                return "<G>e@<Y>FAKE: " + getUUID() + "<GR>(FAKE-" + entity.getType().name() + "/" + entity.getName() + ")";
             }
             else if (isSpawnedOrValidForTag()) {
-                return "e@ " + getUUID() + "<GR>(" + entity.getType().name() + "/" + entity.getName() + ")";
+                return "<G>e@<Y> " + getUUID() + "<GR>(" + entity.getType().name() + "/" + entity.getName() + ")";
             }
         }
-        return identify();
+        return identify(this::getWaitingMechanismsDebuggable);
     }
 
     @Override
@@ -1148,6 +1149,10 @@ else if (isFake) {
 
     @Override
     public String identify() {
+        return identify(this::getWaitingMechanismsString);
+    }
+
+    public String identify(Supplier<String> mechsHandler) {
         if (npc != null) {
             return npc.identify();
         }
@@ -1159,21 +1164,32 @@ public String identify() {
                 return getDenizenPlayer().identify();
             }
             if (entityScript != null) {
-                return "e@" + getUUID() + "/" + entityScript + getWaitingMechanismsString();
+                return "e@" + getUUID() + "/" + entityScript + mechsHandler.get();
             }
             if (entity_type != null) {
-                return "e@" + getUUID() + "/" + entity_type.getLowercaseName() + getWaitingMechanismsString();
+                return "e@" + getUUID() + "/" + entity_type.getLowercaseName() + mechsHandler.get();
             }
         }
         if (entityScript != null) {
-            return "e@" + entityScript + getWaitingMechanismsString();
+            return "e@" + entityScript + mechsHandler.get();
         }
         if (entity_type != null) {
-            return "e@" + entity_type.getLowercaseName() + getWaitingMechanismsString();
+            return "e@" + entity_type.getLowercaseName() + mechsHandler.get();
         }
         return "null";
     }
 
+    public String getWaitingMechanismsDebuggable() {
+        StringBuilder properties = new StringBuilder();
+        for (Mechanism mechanism : mechanisms) {
+            properties.append(mechanism.getName()).append("<G>=<Y>").append(PropertyParser.escapePropertyValue(mechanism.getValue().asString())).append("<G>; <Y>");
+        }
+        if (properties.length() > 0) {
+            return "<G>[<Y>" + properties.substring(0, properties.length() - "; <Y>".length()) + " <G>]";
+        }
+        return "";
+    }
+
     public String getWaitingMechanismsString() {
         StringBuilder properties = new StringBuilder();
         for (Mechanism mechanism : mechanisms) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java
@@ -1117,6 +1117,17 @@ public String identify() {
         }
     }
 
+    @Override
+    public String debuggable() {
+        if (isUnique()) {
+            return "<G>in@<Y>" + NoteManager.getSavedId(this);
+        }
+        else {
+            trackTemporaryInventory(this);
+            return "<G>in@<Y>" + idType + PropertyParser.getPropertiesDebuggable(this);
+        }
+    }
+
     @Override
     public String identifySimple() {
         return identify();

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java
@@ -435,7 +435,15 @@ public String identify() {
         if (item == null || item.getType() == Material.AIR) {
             return "i@air";
         }
-        return "i@" + getMaterial().identifyNoPropertiesNoIdentifier().replace("m@", "") + PropertyParser.getPropertiesString(this);
+        return "i@" + getMaterial().identifyNoPropertiesNoIdentifier() + PropertyParser.getPropertiesString(this);
+    }
+
+    @Override
+    public String debuggable() {
+        if (item == null || item.getType() == Material.AIR) {
+            return "i@air";
+        }
+        return "<G>i@<Y>" + getMaterial().identifyNoPropertiesNoIdentifier() + PropertyParser.getPropertiesDebuggable(this);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java
@@ -198,6 +198,11 @@ public String identify() {
         return "m@" + identifyNoIdentifier();
     }
 
+    @Override
+    public String debuggable() {
+        return "<G>m@<Y>" + CoreUtilities.toLowerCase(material.name()) + PropertyParser.getPropertiesDebuggable(this);
+    }
+
     @Override
     public String identifySimple() {
         return "m@" + identifySimpleNoIdentifier();

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java
@@ -365,10 +365,10 @@ public String getPrefix() {
     @Override
     public String debuggable() {
         if (npc.getOwningRegistry() == CitizensAPI.getNPCRegistry()) {
-            return "n@" + npc.getId() + "<GR> (" + getName() + "<GR>)";
+            return "<G>n@<Y>" + npc.getId() + "<GR> (" + getName() + "<GR>)";
         }
         else {
-            return "n@" + npc.getId() + "<G>," + npc.getOwningRegistry().getName() + "<GR> (" + getName() + "<GR>)";
+            return "<G>n@<Y>" + npc.getId() + "<G>," + npc.getOwningRegistry().getName() + "<GR> (" + getName() + "<GR>)";
         }
     }
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/TradeTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/TradeTag.java
@@ -113,6 +113,11 @@ public String getObjectType() {
         return "Trade";
     }
 
+    @Override
+    public String debuggable() {
+        return "<G>trade@trade" + PropertyParser.getPropertiesDebuggable(this);
+    }
+
     @Override
     public String identify() {
         return "trade@trade" + PropertyParser.getPropertiesString(this);