NotableManager internal rework part 1

DenizenScript · Oct 19, 2021 · bff3159 · bff3159
1 parent 958a703
commit bff3159
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 139 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
@@ -98,7 +98,6 @@ public BukkitCommandRegistry getCommandRegistry() {
     }
 
     public TagManager tagManager;
-    public NotableManager notableManager;
     public OldEventManager eventManager;
 
     public BukkitWorldScriptHelper worldScriptHelper;
@@ -173,7 +172,6 @@ else if (javaVersion.startsWith("9") || javaVersion.startsWith("1.9") || javaVer
         }
         commandRegistry = new BukkitCommandRegistry();
         triggerRegistry = new TriggerRegistry();
-        notableManager = new NotableManager();
         tagManager = new TagManager();
         boolean citizensBork = false;
         try {
@@ -420,8 +418,8 @@ else if (javaVersion.startsWith("9") || javaVersion.startsWith("1.9") || javaVer
             }
             try {
                 exCommand.processTagList();
-                // Reload notables from notables.yml into memory
-                notableManager.reloadNotables();
+                // Reload notes from file
+                NotableManager.reload();
                 // Process script files (events, etc).
                 DenizenCore.postLoadScripts();
                 Debug.log(ChatColor.LIGHT_PURPLE + "+-------------------------+");
@@ -498,7 +496,7 @@ public void onDisable() {
         }
         hasDisabled = true;
         ServerStopScriptEvent.instance.fire();
-        notableManager.saveNotables();
+        NotableManager.save();
         ScoreboardHelper._saveScoreboards();
         InventoryScriptHelper._savePlayerInventories();
         commandRegistry.disableCoreMembers();
@@ -557,8 +555,8 @@ public FileConfiguration getScoreboards() {
     }
 
     public void saveSaves(boolean canSleep) {
-        // Save notables
-        notableManager.saveNotables();
+        // Save notes
+        NotableManager.save();
         // Save scoreboards to scoreboards.yml
         ScoreboardHelper._saveScoreboards();
         // Save maps to maps.yml

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java
@@ -114,7 +114,7 @@ public boolean couldMatchArea(String text) {
         }
         if (isAdvancedMatchable(text)) {
             MatchHelper matcher = createMatcher(text);
-            for (Notable obj : NotableManager.notableObjects.values()) {
+            for (Notable obj : NotableManager.nameToObject.values()) {
                 if (obj instanceof AreaContainmentObject && matcher.doesMatch(((AreaContainmentObject) obj).getNoteName())) {
                     return true;
                 }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java
@@ -18,9 +18,8 @@
 import com.denizenscript.denizencore.tags.TagRunnable;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizencore.utilities.Deprecations;
+import com.denizenscript.denizencore.utilities.YamlConfiguration;
 import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.BoundingBox;
 import org.bukkit.util.Vector;
@@ -621,7 +620,7 @@ public boolean isUnique() {
     @Override
     @Note("Cuboids")
     public Object getSaveObject() {
-        ConfigurationSection section = new YamlConfiguration();
+        YamlConfiguration section = new YamlConfiguration();
         section.set("object", identifyFull());
         section.set("flags", flagTracker.toString());
         return section;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EllipsoidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EllipsoidTag.java
@@ -15,9 +15,8 @@
 import com.denizenscript.denizencore.tags.TagContext;
 import com.denizenscript.denizencore.tags.TagRunnable;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
+import com.denizenscript.denizencore.utilities.YamlConfiguration;
 import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
@@ -279,7 +278,7 @@ public boolean isUnique() {
     @Override
     @Note("Ellipsoids")
     public Object getSaveObject() {
-        ConfigurationSection section = new YamlConfiguration();
+        YamlConfiguration section = new YamlConfiguration();
         section.set("object", identifyFull());
         section.set("flags", flagTracker.toString());
         return section;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java
@@ -33,14 +33,13 @@
 import com.denizenscript.denizencore.tags.TagRunnable;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizencore.utilities.Deprecations;
+import com.denizenscript.denizencore.utilities.YamlConfiguration;
 import net.citizensnpcs.api.CitizensAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.Keyed;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.DoubleChest;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
@@ -143,7 +142,7 @@ public boolean isUnique() {
     public Object getSaveObject() {
         isSaving = true;
         try {
-            ConfigurationSection section = new YamlConfiguration();
+            YamlConfiguration section = new YamlConfiguration();
             section.set("object", "in@" + idType + PropertyParser.getPropertiesString(this));
             section.set("flags", flagTracker.toString());
             return section;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
@@ -124,12 +124,7 @@ public void makeUnique(String id) {
 
     @Note("Locations")
     public String getSaveObject() {
-        return (getX())
-                + "," + getY()
-                + "," + (getZ())
-                + "," + getPitch()
-                + "," + getYaw()
-                + "," + getWorldName();
+        return getX() + "," + getY() + "," + getZ() + "," + getPitch() + "," + getYaw() + "," + getWorldName();
     }
 
     public static String getSaved(LocationTag location) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java
@@ -16,9 +16,8 @@
 import com.denizenscript.denizencore.tags.TagContext;
 import com.denizenscript.denizencore.tags.TagRunnable;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
+import com.denizenscript.denizencore.utilities.YamlConfiguration;
 import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -410,7 +409,7 @@ public boolean isUnique() {
     @Override
     @Note("Polygons")
     public Object getSaveObject() {
-        ConfigurationSection section = new YamlConfiguration();
+        YamlConfiguration section = new YamlConfiguration();
         section.set("object", identifyFull());
         section.set("flags", flagTracker.toString());
         return section;