add a new object fetcher init message

DenizenScript · Jan 16, 2020 · 569505d · 569505d
1 parent 0be540d
commit 569505d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
@@ -364,10 +364,9 @@ public void onEnable() {
             // Register all the modern script events
             ScriptEventRegistry.registerMainEvents();
 
-            CommonRegistries.registerMainObjects();
-
             // Register Core ObjectTags with the ObjectFetcher
             ObjectFetcher.registerCoreObjects();
+            CommonRegistries.registerMainObjects();
         }
         catch (Exception e) {
             Debug.echoError(e);

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/CommonRegistries.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/CommonRegistries.java
@@ -2,6 +2,7 @@
 
 import com.denizenscript.denizen.objects.*;
 import com.denizenscript.denizen.tags.core.*;
+import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.depends.Depends;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 
@@ -194,30 +195,34 @@ public static void registerMainTagHandlers() {
         new PluginTagBase();
         new TradeTagBase();
         new WorldTagBase();
-
         // Other bases
         new ServerTagBase();
         new TextTagBase();
         new ParseTagBase();
     }
 
     public static void registerMainObjects() {
-        ObjectFetcher.registerWithObjectFetcher(BiomeTag.class, BiomeTag.tagProcessor);     // b@
-        ObjectFetcher.registerWithObjectFetcher(ChunkTag.class, ChunkTag.tagProcessor);     // ch@
-        ObjectFetcher.registerWithObjectFetcher(ColorTag.class, ColorTag.tagProcessor);     // co@
-        ObjectFetcher.registerWithObjectFetcher(CuboidTag.class, CuboidTag.tagProcessor);    // cu@
+        ObjectFetcher.registerWithObjectFetcher(BiomeTag.class, BiomeTag.tagProcessor); // b@
+        ObjectFetcher.registerWithObjectFetcher(ChunkTag.class, ChunkTag.tagProcessor); // ch@
+        ObjectFetcher.registerWithObjectFetcher(ColorTag.class, ColorTag.tagProcessor); // co@
+        ObjectFetcher.registerWithObjectFetcher(CuboidTag.class, CuboidTag.tagProcessor); // cu@
         ObjectFetcher.registerWithObjectFetcher(EllipsoidTag.class, EllipsoidTag.tagProcessor); // ellipsoid@
-        ObjectFetcher.registerWithObjectFetcher(EntityTag.class, EntityTag.tagProcessor);    // e@
+        ObjectFetcher.registerWithObjectFetcher(EntityTag.class, EntityTag.tagProcessor); // e@
         ObjectFetcher.registerWithObjectFetcher(InventoryTag.class, InventoryTag.tagProcessor); // in@
-        ObjectFetcher.registerWithObjectFetcher(ItemTag.class, ItemTag.tagProcessor);      // i@
-        ObjectFetcher.registerWithObjectFetcher(LocationTag.class, LocationTag.tagProcessor);  // l@
-        ObjectFetcher.registerWithObjectFetcher(MaterialTag.class, MaterialTag.tagProcessor);  // m@
+        ObjectFetcher.registerWithObjectFetcher(ItemTag.class, ItemTag.tagProcessor); // i@
+        ObjectFetcher.registerWithObjectFetcher(LocationTag.class, LocationTag.tagProcessor); // l@
+        ObjectFetcher.registerWithObjectFetcher(MaterialTag.class, MaterialTag.tagProcessor); // m@
         if (Depends.citizens != null) {
-            ObjectFetcher.registerWithObjectFetcher(NPCTag.class, NPCTag.tagProcessor);   // n@
+            ObjectFetcher.registerWithObjectFetcher(NPCTag.class, NPCTag.tagProcessor); // n@
+        }
+        ObjectFetcher.registerWithObjectFetcher(PlayerTag.class, PlayerTag.tagProcessor); // p@
+        ObjectFetcher.registerWithObjectFetcher(PluginTag.class, PluginTag.tagProcessor); // pl@
+        ObjectFetcher.registerWithObjectFetcher(TradeTag.class, TradeTag.tagProcessor); // trade@
+        ObjectFetcher.registerWithObjectFetcher(WorldTag.class, WorldTag.tagProcessor); // w@
+        StringBuilder debug = new StringBuilder(256);
+        for (ObjectFetcher.ObjectType<?> objectType : ObjectFetcher.objectsByPrefix.values()) {
+            debug.append(objectType.clazz.getSimpleName()).append(" as ").append(objectType.prefix).append(", ");
         }
-        ObjectFetcher.registerWithObjectFetcher(PlayerTag.class, PlayerTag.tagProcessor);    // p@
-        ObjectFetcher.registerWithObjectFetcher(PluginTag.class, PluginTag.tagProcessor);    // pl@
-        ObjectFetcher.registerWithObjectFetcher(TradeTag.class, TradeTag.tagProcessor);     // trade@
-        ObjectFetcher.registerWithObjectFetcher(WorldTag.class, WorldTag.tagProcessor);     // w@
+        Debug.echoApproval("Loaded core object types: [" + debug.substring(0, debug.length() - 2) + "]");
     }
 }