CommandRegistry: core ownership

DenizenScript · Aug 23, 2022 · 70c1f4d · 70c1f4d
1 parent 2194a75
commit 70c1f4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/DenizenCore.java b/src/main/java/com/denizenscript/denizencore/DenizenCore.java
@@ -4,6 +4,7 @@
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.events.core.*;
 import com.denizenscript.denizencore.flags.SavableMapFlagTracker;
+import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.core.SecretTag;
 import com.denizenscript.denizencore.objects.notable.NoteManager;
 import com.denizenscript.denizencore.scripts.ScriptHelper;
@@ -39,7 +40,7 @@ public class DenizenCore {
     /**
      * All commands known to the system are registered here.
      */
-    public static CommandRegistry commandRegistry;
+    public static CommandRegistry commandRegistry = new CommandRegistry();
 
     /**
      * Monotonic time (CoreUtilities.monotonicMillis) that the engine first loaded.
@@ -136,7 +137,11 @@ public static void init(DenizenImplementation implementation) {
         Debug.log("Initializing Denizen Core v" + VERSION +
                 ", implementation for " + implementation.getImplementationName()
                 + " version " + implementation.getImplementationVersion());
+        ScriptRegistry._registerCoreTypes();
         ScriptEvent.registerCoreEvents();
+        ObjectFetcher.registerCoreObjects();
+        TagManager.registerCoreTags();
+        commandRegistry.registerCoreCommands();
     }
 
     /**

diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/CommandRegistry.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/CommandRegistry.java
@@ -9,7 +9,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class CommandRegistry {
+public class CommandRegistry {
 
     public CommandRegistry() {
     }