update for new CoreConfiguration

DenizenScript · Apr 4, 2022 · 8824f4a · 8824f4a
1 parent b8246eb
commit 8824f4a
Show file tree

Hide file tree

Showing 31 changed files with 134 additions and 225 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
@@ -51,6 +51,7 @@
 import com.denizenscript.denizencore.scripts.commands.core.AdjustCommand;
 import com.denizenscript.denizencore.scripts.commands.queue.RunLaterCommand;
 import com.denizenscript.denizencore.tags.TagManager;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizencore.utilities.debugging.SlowWarning;
 import com.denizenscript.denizencore.utilities.debugging.StrongWarning;
@@ -423,7 +424,7 @@ else if (javaVersion.startsWith("17")) {
                     DenizenCore.tick(50); // Sadly, minecraft has no delta timing, so a tick is always 50ms.
                 }, 1, 1);
                 InventoryTag.setupInventoryTracker();
-                if (!MapTagBasedFlagTracker.skipAllCleanings) {
+                if (!CoreConfiguration.skipAllFlagCleanings) {
                     BukkitWorldScriptHelper.cleanAllWorldChunkFlags();
                 }
                 Bukkit.getPluginManager().registerEvents(new PlayerFlagHandler(), this);
@@ -497,10 +498,9 @@ public void onDisable() {
     public void reloadConfig() {
         super.reloadConfig();
         Settings.refillCache();
-        if (!Settings.showDebug()) {
+        if (!CoreConfiguration.defaultDebugMode) {
             getLogger().warning("Debug is disabled in the Denizen config. This is almost always a mistake, and should not be done in the majority of cases.");
         }
-        SlowWarning.WARNING_RATE = Settings.warningRate();
     }
 
     private FileConfiguration scoreboardsConfig = null;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java
@@ -14,6 +14,7 @@
 import com.denizenscript.denizencore.objects.notable.Notable;
 import com.denizenscript.denizencore.objects.notable.NoteManager;
 import com.denizenscript.denizencore.tags.TagContext;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.Deprecations;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizencore.events.ScriptEvent;
@@ -535,7 +536,7 @@ public static EventExecutor getExecutor(RegisteredListener listener) {
     @Override
     public ScriptEvent fire() {
         if (!Bukkit.isPrimaryThread()) {
-            if (Debug.verbose) {
+            if (CoreConfiguration.debugVerbose) {
                 Debug.log("Event is firing async: " + getName());
             }
             BukkitScriptEvent altEvent = (BukkitScriptEvent) clone();

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java
@@ -2,6 +2,7 @@
 
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.scripts.containers.core.FormatScriptContainer;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
 import com.denizenscript.denizen.utilities.Settings;
@@ -126,7 +127,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
                 }
                 else {
                     String formatstr = formatscr.getFormatText(null, player);
-                    if (Debug.verbose) {
+                    if (CoreConfiguration.debugVerbose) {
                         Debug.log("Setting format to " + formatstr);
                     }
                     if (pcEvent != null) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPreLoginScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPreLoginScriptEvent.java
@@ -8,6 +8,7 @@
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.core.QueueTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import org.bukkit.Bukkit;
@@ -114,18 +115,18 @@ public ObjectTag getContext(String name) {
     }
 
     public boolean needsToWait() {
-        if (Debug.verbose) {
+        if (CoreConfiguration.debugVerbose) {
             Debug.log("Prelogin: queues that might need waiting: " + waitForQueues.size());
         }
         for (QueueTag queue : waitForQueues) {
             if (!queue.getQueue().isStopped) {
-                if (Debug.verbose) {
+                if (CoreConfiguration.debugVerbose) {
                     Debug.log("Prelogin: need to wait for " + queue.getQueue().id);
                 }
                 return true;
             }
         }
-        if (Debug.verbose) {
+        if (CoreConfiguration.debugVerbose) {
             Debug.log("Prelogin: no need to wait");
         }
         return false;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SittingTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SittingTrait.java
@@ -5,6 +5,7 @@
 import com.denizenscript.denizen.objects.LocationTag;
 import com.denizenscript.denizen.objects.NPCTag;
 import com.denizenscript.denizen.utilities.Utilities;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.MemoryNPCDataStore;
@@ -45,7 +46,7 @@ public void run() {
         }
         if (!Utilities.checkLocation((LivingEntity) npc.getEntity(), chairLocation, 2)) {
             stand();
-            if (Debug.verbose) {
+            if (CoreConfiguration.debugVerbose) {
                 Debug.log("NPC " + npc.getId() + " stood up because it moved away from its chair.");
             }
         }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -27,6 +27,7 @@
 import com.denizenscript.denizencore.objects.core.*;
 import com.denizenscript.denizencore.tags.ObjectTagProcessor;
 import com.denizenscript.denizencore.tags.TagRunnable;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.Deprecations;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
@@ -959,7 +960,7 @@ else if (face == BlockFace.SOUTH) {
                     else {
                         entity = entity_type.spawnNewEntity(location, mechanisms, entityScript);
                         if (entity == null) {
-                            if (Debug.verbose) {
+                            if (CoreConfiguration.debugVerbose) {
                                 Debug.echoError("Failed to spawn entity of type " + entity_type.getName());
                             }
                             return;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java
@@ -10,6 +10,7 @@
 import com.denizenscript.denizencore.flags.AbstractFlagTracker;
 import com.denizenscript.denizencore.flags.FlaggableObject;
 import com.denizenscript.denizencore.flags.MapTagFlagTracker;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizencore.objects.*;
 import com.denizenscript.denizen.nms.NMSHandler;
@@ -121,7 +122,7 @@ else if (ScriptRegistry.containsScript(string, BookScriptContainer.class)) {
             }
         }
         catch (Exception ex) {
-            if (Debug.verbose) {
+            if (CoreConfiguration.debugVerbose) {
                 Debug.echoError(ex);
             }
         }
@@ -138,7 +139,7 @@ else if (ScriptRegistry.containsScript(string, BookScriptContainer.class)) {
             if (!string.equalsIgnoreCase("none") && (context == null || context.showErrors())) {
                 Debug.log("Does not match a valid item ID or material: " + string);
             }
-            if (Debug.verbose) {
+            if (CoreConfiguration.debugVerbose) {
                 Debug.echoError(ex);
             }
         }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java
@@ -11,6 +11,7 @@
 import com.denizenscript.denizencore.flags.AbstractFlagTracker;
 import com.denizenscript.denizencore.flags.FlaggableObject;
 import com.denizenscript.denizencore.tags.ObjectTagProcessor;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.Deprecations;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizencore.objects.*;
@@ -175,7 +176,7 @@ public Entity getEntity() {
         catch (NullPointerException ex) {
             Debug.echoError("Uh oh! Denizen has encountered a NPE while trying to fetch an NPC entity. " +
                     "Has this NPC been removed?");
-            if (Debug.verbose) {
+            if (CoreConfiguration.debugVerbose) {
                 Debug.echoError(ex);
             }
             return null;
@@ -195,7 +196,7 @@ public LivingEntity getLivingEntity() {
         catch (NullPointerException ex) {
             Debug.echoError("Uh oh! Denizen has encountered a NPE while trying to fetch an NPC livingEntity. " +
                     "Has this NPC been removed?");
-            if (Debug.verbose) {
+            if (CoreConfiguration.debugVerbose) {
                 Debug.echoError(ex);
             }
             return null;
@@ -210,7 +211,7 @@ public EntityTag getDenizenEntity() {
         catch (NullPointerException ex) {
             Debug.echoError("Uh oh! Denizen has encountered a NPE while trying to fetch an NPC EntityTag. " +
                     "Has this NPC been removed?");
-            if (Debug.verbose) {
+            if (CoreConfiguration.debugVerbose) {
                 Debug.echoError(ex);
             }
             return null;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemEnchantments.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemEnchantments.java
@@ -2,6 +2,7 @@
 
 import com.denizenscript.denizen.objects.EnchantmentTag;
 import com.denizenscript.denizencore.objects.core.MapTag;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.Deprecations;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizen.objects.ItemTag;
@@ -298,7 +299,7 @@ public void adjust(Mechanism mechanism) {
                         }
                         catch (NumberFormatException ex) {
                             mechanism.echoError("Cannot apply enchantment '" + data[0] + "': '" + data[1] + "' is not a valid integer!");
-                            if (Debug.verbose) {
+                            if (CoreConfiguration.debugVerbose) {
                                 Debug.echoError(ex);
                             }
                         }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/BukkitCommandRegistry.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/BukkitCommandRegistry.java
@@ -9,6 +9,7 @@
 import com.denizenscript.denizen.scripts.commands.player.*;
 import com.denizenscript.denizen.scripts.commands.server.*;
 import com.denizenscript.denizen.scripts.commands.world.*;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.depends.Depends;
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
@@ -186,7 +187,7 @@ public void registerCommands() {
             AutoNoCitizensCommand.registerMany("ACTION", "ANCHOR", "ANIMATE", "ASSIGNMENT", "BREAK", "CHAT", "CREATE", "DESPAWN",
                     "DISENGAGE", "ENGAGE", "FISH", "LOOKCLOSE", "PAUSE", "RESUME", "POSE", "PUSHABLE", "RENAME", "SIT", "STAND", "TRAIT", "TRIGGER", "VULNERABLE");
         }
-        if (Debug.verbose) {
+        if (CoreConfiguration.debugVerbose) {
             Debug.echoApproval("Loaded core commands: " + instances.keySet());
         }
     }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java
@@ -4,6 +4,7 @@
 import com.denizenscript.denizen.utilities.Conversion;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.entity.Velocity;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.entity.Position;
 import com.denizenscript.denizen.nms.NMSHandler;
@@ -319,7 +320,7 @@ else if (lead == null) {
             public void run() {
                 // If the entity is no longer spawned, stop the task
                 if (!lastEntity.isSpawned()) {
-                    if (Debug.verbose) {
+                    if (CoreConfiguration.debugVerbose) {
                         Debug.log("Shoot ended because entity not spawned");
                     }
                     flying = false;
@@ -330,15 +331,15 @@ else if (lastLocation != null && lastVelocity != null && !(lastEntity.getBukkitE
                     if (lastLocation.getWorld() != lastEntity.getBukkitEntity().getWorld()
                             || (lastLocation.distanceSquared(lastEntity.getBukkitEntity().getLocation()) < 0.1
                             && lastVelocity.distanceSquared(lastEntity.getBukkitEntity().getVelocity()) < 0.1)) {
-                        if (Debug.verbose) {
+                        if (CoreConfiguration.debugVerbose) {
                             Debug.log("Shoot ended because distances short - locations: " + (lastLocation.distanceSquared(lastEntity.getBukkitEntity().getLocation()))
                                     + ", velocity: " + (lastVelocity.distanceSquared(lastEntity.getBukkitEntity().getVelocity()) < 0.1));
                         }
                         flying = false;
                     }
                 }
                 if (!arrows.containsKey(lastEntity.getUUID()) || arrows.get(lastEntity.getUUID()) != null) {
-                    if (Debug.verbose) {
+                    if (CoreConfiguration.debugVerbose) {
                         Debug.log("Shoot ended because uuid was updated (hit entity?)");
                     }
                     flying = false;
@@ -390,7 +391,7 @@ public void projectileHit(ProjectileHitEvent event) {
         if (!arrows.containsKey(event.getEntity().getUniqueId())) {
             return;
         }
-        if (Debug.verbose) {
+        if (CoreConfiguration.debugVerbose) {
             Debug.log("Shoot ending because hit");
         }
         if (event.getHitEntity() != null) {
@@ -410,7 +411,7 @@ public void arrowDamage(EntityDamageByEntityEvent event) {
         if (!arrows.containsKey(arrow.getUniqueId())) {
             return;
         }
-        if (Debug.verbose) {
+        if (CoreConfiguration.debugVerbose) {
             Debug.log("Shoot ending because damage");
         }
         arrows.put(arrow.getUniqueId(), new EntityTag(event.getEntity()));

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java
@@ -9,6 +9,7 @@
 import com.denizenscript.denizencore.objects.core.ListTag;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
 import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import org.bukkit.Sound;
 
@@ -155,7 +156,7 @@ else if (locations != null) {
         }
         catch (Exception e) {
             Debug.echoDebug(scriptEntry, "Unable to play sound.");
-            if (Debug.verbose) {
+            if (CoreConfiguration.debugVerbose) {
                 Debug.echoError(e);
             }
         }

diff --git a/.../main/java/com/denizenscript/denizen/scripts/containers/core/BukkitWorldScriptHelper.java b/.../main/java/com/denizenscript/denizen/scripts/containers/core/BukkitWorldScriptHelper.java
@@ -9,6 +9,7 @@
 import com.denizenscript.denizen.utilities.Settings;
 import com.denizenscript.denizen.utilities.flags.DataPersistenceFlagTracker;
 import com.denizenscript.denizencore.flags.MapTagBasedFlagTracker;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
@@ -106,7 +107,7 @@ public void playerQuit(PlayerQuitEvent event) {
 
     @EventHandler
     public void chunkLoadEvent(ChunkLoadEvent event) {
-        if (MapTagBasedFlagTracker.skipAllCleanings) {
+        if (CoreConfiguration.skipAllFlagCleanings) {
             return;
         }
         new DataPersistenceFlagTracker(event.getChunk()).doTotalClean();

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/TriggerRegistry.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/TriggerRegistry.java
@@ -3,6 +3,7 @@
 import com.denizenscript.denizen.scripts.triggers.core.ChatTrigger;
 import com.denizenscript.denizen.scripts.triggers.core.DamageTrigger;
 import com.denizenscript.denizen.scripts.triggers.core.ProximityTrigger;
+import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.scripts.triggers.core.ClickTrigger;
@@ -59,7 +60,7 @@ public void registerCoreMembers() {
         new ChatTrigger().activate().as("Chat");
         new DamageTrigger().activate().as("Damage");
         new ProximityTrigger().activate().as("Proximity");
-        if (Debug.verbose) {
+        if (CoreConfiguration.debugVerbose) {
             Debug.echoApproval("Loaded core triggers: " + instances.keySet());
         }
         else {