diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java index 3c7ecdff0a..f1715550d3 100644 --- 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 index eb0f93e5d0..e5c9a32b8a 100644 --- 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 index 59a702e5b9..d210502231 100644 --- 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 index 213e716686..7cf551b85c 100644 --- 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 index 98eb36a98b..9e1b0427e1 100644 --- 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 index b2dc0baf07..b6cff909ce 100644 --- 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 index c12133de5d..34ae87338c 100644 --- 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 index 3be7cd95f1..49613c182a 100644 --- 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 index d65ddb4f65..cc7acfceba 100644 --- 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 index 3400dd69cd..5eed019189 100644 --- 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 index 4240d5155f..a4bba93433 100644 --- 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,7 +331,7 @@ 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)); } @@ -338,7 +339,7 @@ else if (lastLocation != null && lastVelocity != null && !(lastEntity.getBukkitE } } 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 index f17f88ddc5..d85fb15a33 100644 --- 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/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/BukkitWorldScriptHelper.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/BukkitWorldScriptHelper.java index 1279faad12..578b3c4f7e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/BukkitWorldScriptHelper.java +++ b/plugin/src/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 index a0c70580f6..d18cab9b6b 100644 --- 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 { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java index 162d569b0a..1859b5c44e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java @@ -4,6 +4,7 @@ import com.denizenscript.denizen.scripts.containers.core.InteractScriptContainer; import com.denizenscript.denizen.scripts.containers.core.InteractScriptHelper; import com.denizenscript.denizen.utilities.Utilities; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.denizenscript.denizencore.utilities.debugging.Debug; import com.denizenscript.denizen.utilities.Settings; import com.denizenscript.denizen.nms.NMSHandler; @@ -111,33 +112,33 @@ public void onEnable() { // --> public ChatContext process(Player player, String message) { NPCTag npc = Utilities.getClosestNPC_ChatTrigger(player.getLocation(), 25); - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log("Processing chat trigger: valid npc? " + (npc != null)); } if (npc == null) { return new ChatContext(false); } - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log("Has trait? " + npc.getCitizen().hasTrait(TriggerTrait.class)); } if (!npc.getCitizen().hasTrait(TriggerTrait.class)) { return new ChatContext(false); } - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log("enabled? " + npc.getCitizen().getOrAddTrait(TriggerTrait.class).isEnabled(name)); } if (!npc.getCitizen().getOrAddTrait(TriggerTrait.class).isEnabled(name)) { return new ChatContext(false); } if (npc.getTriggerTrait().getRadius(name) < npc.getLocation().distance(player.getLocation())) { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log("Not in range"); } return new ChatContext(false); } if (Settings.chatMustSeeNPC()) { if (!player.hasLineOfSight(npc.getEntity())) { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log("no LOS"); } return new ChatContext(false); @@ -145,7 +146,7 @@ public ChatContext process(Player player, String message) { } if (Settings.chatMustLookAtNPC()) { if (!NMSHandler.getEntityHelper().isFacingEntity(player, npc.getEntity(), 45)) { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log("Not facing"); } return new ChatContext(false); @@ -157,7 +158,7 @@ public ChatContext process(Player player, String message) { TriggerTrait.TriggerContext trigger = npc.getTriggerTrait().trigger(ChatTrigger.this, new PlayerTag(player), context); if (trigger.hasDetermination()) { if (trigger.getDeterminations().containsCaseInsensitive("cancelled")) { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log("Cancelled"); } return new ChatContext(true); @@ -165,7 +166,7 @@ public ChatContext process(Player player, String message) { } if (!trigger.wasTriggered()) { if (Settings.chatGloballyIfUninteractable()) { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log(ChatColor.YELLOW + "Resuming. " + ChatColor.WHITE + "The NPC is currently cooling down or engaged."); } return new ChatContext(false); @@ -179,7 +180,7 @@ public ChatContext process(Player player, String message) { } List scripts = npc.getInteractScripts(new PlayerTag(player), ChatTrigger.class); if (scripts == null) { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log("null scripts"); } return new ChatContext(message, false); @@ -211,7 +212,7 @@ public void processSingle(String message, Player player, NPCTag npc, Map objectType : ObjectFetcher.objectsByPrefix.values()) { debug.append(objectType.clazz.getSimpleName()).append(" as ").append(objectType.prefix).append(", "); diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/FormattedTextHelper.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/FormattedTextHelper.java index 644f2f56eb..fad51cd3ef 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/FormattedTextHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/FormattedTextHelper.java @@ -2,6 +2,7 @@ import com.denizenscript.denizen.nms.NMSHandler; import com.denizenscript.denizencore.utilities.AsciiMatcher; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.denizenscript.denizencore.utilities.CoreUtilities; import com.denizenscript.denizencore.utilities.debugging.Debug; import net.md_5.bungee.api.ChatColor; @@ -552,7 +553,7 @@ else if (innardType.equals("color")) { else if (colorChar.length() == 7) { color = ChatColor.of(colorChar); } - else if (Debug.verbose) { + else if (CoreConfiguration.debugVerbose) { Debug.echoError("Text parse issue: cannot interpret color '" + innardBase.get(1) + "'."); } if (color != null) { @@ -587,7 +588,7 @@ else if (innardType.equals("font")) { } } else { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.echoError("Text parse issue: cannot interpret type '" + innardType + "' with " + innardParts.size() + " parts."); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/Settings.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/Settings.java index a971984a7d..163d48433b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/Settings.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/Settings.java @@ -4,12 +4,9 @@ import com.denizenscript.denizen.scripts.commands.entity.RemoveCommand; import com.denizenscript.denizen.tags.core.CustomColorTagBase; import com.denizenscript.denizen.utilities.flags.PlayerFlagHandler; -import com.denizenscript.denizencore.flags.MapTagBasedFlagTracker; -import com.denizenscript.denizencore.utilities.debugging.Debug; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.denizenscript.denizencore.objects.core.DurationTag; -import com.denizenscript.denizencore.scripts.ScriptHelper; import com.denizenscript.denizencore.utilities.CoreUtilities; -import com.denizenscript.denizencore.utilities.debugging.FutureWarning; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; @@ -19,37 +16,49 @@ public class Settings { public static void refillCache() { FileConfiguration config = Denizen.getInstance().getConfig(); - cache_showDebug = config.getBoolean("Debug.Show", true); - com.denizenscript.denizen.utilities.debugging.Debug.showDebug = cache_showDebug; - Debug.verbose = config.getBoolean("Debug.Verbose", false); - Debug.showLoading = config.getBoolean("Debug.Show loading info", false); - cache_overrideHelp = config.getBoolean("Debug.Override help", true); - cache_useDefaultScriptPath = config.getBoolean("Scripts location.Use default script folder", true); - cache_showExHelp = config.getBoolean("Debug.Ex command help", true); - cache_showExDebug = config.getBoolean("Debug.Ex command debug", true); - cache_getAlternateScriptPath = config.getString("Scripts location.Alternative folder path", "plugins/Denizen"); - cache_scriptEncoding = config.getString("Scripts.Encoding", "default"); - if (cache_scriptEncoding.equalsIgnoreCase("default")) { - ScriptHelper.encoding = null; + // Core + CoreConfiguration.defaultDebugMode = config.getBoolean("Debug.Show", true); + com.denizenscript.denizen.utilities.debugging.Debug.showDebug = CoreConfiguration.defaultDebugMode; + CoreConfiguration.debugVerbose = config.getBoolean("Debug.Verbose", false); + CoreConfiguration.debugLoadingInfo = config.getBoolean("Debug.Show loading info", false); + CoreConfiguration.deprecationWarningRate = config.getLong("Debug.Warning rate", config.getLong("Tags.Warning rate", 10000)); + CoreConfiguration.futureWarningsEnabled = config.getBoolean("Debug.Show future warnings", false); + CoreConfiguration.allowLog = config.getBoolean("Commands.Log.Allow logging", true); + CoreConfiguration.allowFileCopy = config.getBoolean("Commands.Filecopy.Allow copying files", true); + CoreConfiguration.allowWebget = config.getBoolean("Commands.Webget.Allow", true); + CoreConfiguration.whileMaxLoops = config.getInt("Commands.While.Max loops", 10000); + CoreConfiguration.tagTimeout = config.getInt("Tags.Timeout", 10); + CoreConfiguration.tagTimeoutUnsafe = config.getBoolean("Tags.Timeout when unsafe", false); + CoreConfiguration.tagTimeoutWhenSilent = config.getBoolean("Tags.Timeout when silent", false); + CoreConfiguration.scriptQueueSpeed = DurationTag.valueOf(config.getString("Scripts.Queue speed", "instant"), CoreUtilities.basicContext).getSeconds(); + CoreConfiguration.allowConsoleRedirection = config.getBoolean("Debug.Allow console redirection", false); + CoreConfiguration.allowStrangeFileSaves = config.getBoolean("Commands.Yaml.Allow saving outside folder", false); + CoreConfiguration.skipAllFlagCleanings = config.getBoolean("Saves.Skip flag cleaning", false); + String scriptEncoding = config.getString("Scripts.Encoding", "default"); + if (scriptEncoding.equalsIgnoreCase("default")) { + CoreConfiguration.scriptEncoding = null; } else { try { - ScriptHelper.encoding = Charset.forName(cache_scriptEncoding).newDecoder(); + CoreConfiguration.scriptEncoding = Charset.forName(scriptEncoding).newDecoder(); } catch (Exception ex) { ex.printStackTrace(); } } + // Spigot + cache_overrideHelp = config.getBoolean("Debug.Override help", true); + cache_useDefaultScriptPath = config.getBoolean("Scripts location.Use default script folder", true); + cache_showExHelp = config.getBoolean("Debug.Ex command help", true); + cache_showExDebug = config.getBoolean("Debug.Ex command debug", true); + cache_getAlternateScriptPath = config.getString("Scripts location.Alternative folder path", "plugins/Denizen"); cache_consoleWidth = config.getInt("Debug.Line length", 128); cache_trimLength = config.getInt("Debug.Trim length limit", 1024); - cache_allowConsoleRedirection = config.getBoolean("Debug.Allow console redirection", false); cache_canRecordStats = config.getBoolean("Debug.Stats", true); cache_defaultDebugMode = config.getBoolean("Debug.Container default", true); cache_debugLimitPerTick = config.getInt("Debug.Limit per tick", 5000); cache_debugPrefix = config.getString("Debug.Prefix", ""); - FutureWarning.futureWarningsEnabled = config.getBoolean("Debug.Show future warnings", false); cache_warnOnAsyncPackets = config.getBoolean("Debug.Warn on async packets", false); - cache_scriptQueueSpeed = config.getString("Scripts.Queue speed", "instant"); cache_interactQueueSpeed = config.getString("Scripts.Interact.Queue speed", "0.5s"); cache_healthTraitEnabledByDefault = config.getBoolean("Traits.Health.Enabled", false); cache_healthTraitRespawnEnabled = config.getBoolean("Traits.Health.Respawn.Enabled", true); @@ -57,15 +66,10 @@ public static void refillCache() { cache_healthTraitRespawnDelay = config.getString("Traits.Health.Respawn.Delay", "10s"); cache_healthTraitBlockDrops = config.getBoolean("Traits.Health.Block drops", false); cache_engageTimeoutInSeconds = config.getString("Commands.Engage.Timeout", "150s"); - cache_whileMaxLoops = config.getInt("Commands.While.Max loops", 10000); cache_createWorldSymbols = config.getBoolean("Commands.CreateWorld.Allow symbols in names", false); - cache_allowWebget = config.getBoolean("Commands.Webget.Allow", true); - cache_allowFilecopy = config.getBoolean("Commands.Filecopy.Allow copying files", true); cache_allowDelete = config.getBoolean("Commands.Delete.Allow file deletion", true); cache_allowServerStop = config.getBoolean("Commands.Restart.Allow server stop", false); cache_allowServerRestart = config.getBoolean("Commands.Restart.Allow server restart", true); - cache_allowLogging = config.getBoolean("Commands.Log.Allow logging", true); - cache_allowStrangeYAMLSaves = config.getBoolean("Commands.Yaml.Allow saving outside folder", false); cache_limitPath = config.getString("Commands.Yaml.Limit path", "none"); cache_chatMultipleTargetsFormat = config.getString("Commands.Chat.Options.Multiple targets format", "%target%, %target%, %target%, and others"); cache_chatBystandersRange = config.getDouble("Commands.Chat.Options.Range for bystanders", 5.0); @@ -86,16 +90,11 @@ public static void refillCache() { cache_worldScriptTimeEventFrequency = DurationTag.valueOf(config.getString("Scripts.World.Events.On time changes.Frequency of check", "250t"), CoreUtilities.basicContext); cache_blockTagsMaxBlocks = config.getInt("Tags.Block tags.Max blocks", 1000000); cache_chatHistoryMaxMessages = config.getInt("Tags.Chat history.Max messages", 10); - cache_tagTimeout = config.getInt("Tags.Timeout", 10); - cache_tagTimeoutSilent = config.getBoolean("Tags.Timeout when silent", false); - cache_tagTimeoutUnsafe = config.getBoolean("Tags.Timeout when unsafe", false); - cache_warningRate = config.getLong("Debug.Warning rate", config.getLong("Tags.Warning rate", 10000)); cache_packetInterception = config.getBoolean("Packets.Interception", true); cache_packetInterceptAutoInit = config.getBoolean("Packets.Auto init", false); cache_commandScriptAutoInit = config.getBoolean("Scripts.Command.Auto init", false); PlayerFlagHandler.cacheTimeoutSeconds = config.getLong("Saves.Offline player cache timeout", 300); PlayerFlagHandler.asyncPreload = config.getBoolean("Saves.Load async on login", true); - MapTagBasedFlagTracker.skipAllCleanings = config.getBoolean("Saves.Skip flag cleaning", false); RemoveCommand.alwaysWarnOnMassRemove = config.getBoolean("Commands.Remove.Always warn on mass delete", false); ConfigurationSection colorSection = config.getConfigurationSection("Colors"); if (colorSection != null) { @@ -109,27 +108,25 @@ public static void refillCache() { } } - public static boolean cache_showDebug = true, cache_overrideHelp, cache_useDefaultScriptPath, - cache_showExHelp, cache_showExDebug, cache_allowConsoleRedirection, cache_canRecordStats, + public static boolean cache_overrideHelp, cache_useDefaultScriptPath, + cache_showExHelp, cache_showExDebug, cache_canRecordStats, cache_defaultDebugMode, cache_healthTraitEnabledByDefault, cache_healthTraitAnimatedDeathEnabled, - cache_healthTraitRespawnEnabled, cache_allowWebget, cache_allowFilecopy, cache_allowDelete, - cache_allowServerStop, cache_allowServerRestart, cache_allowLogging, cache_allowStrangeYAMLSaves, + cache_healthTraitRespawnEnabled, cache_allowDelete, + cache_allowServerStop, cache_allowServerRestart, cache_healthTraitBlockDrops, cache_chatAsynchronous, cache_chatMustSeeNPC, cache_chatMustLookAtNPC, cache_chatGloballyIfFailedChatTriggers, cache_chatGloballyIfNoChatTriggers, cache_chatGloballyIfUninteractable, cache_worldScriptChatEventAsynchronous, - cache_tagTimeoutSilent, cache_packetInterception, cache_tagTimeoutUnsafe, cache_createWorldSymbols, + cache_packetInterception, cache_createWorldSymbols, cache_commandScriptAutoInit, cache_packetInterceptAutoInit, cache_warnOnAsyncPackets; - public static String cache_getAlternateScriptPath, cache_scriptQueueSpeed, cache_healthTraitRespawnDelay, + public static String cache_getAlternateScriptPath, cache_healthTraitRespawnDelay, cache_engageTimeoutInSeconds, cache_chatMultipleTargetsFormat, cache_chatNoTargetFormat, cache_chatToTargetFormat, cache_chatWithTargetToBystandersFormat, cache_chatWithTargetsToBystandersFormat, cache_chatToNpcFormat, cache_chatToNpcOverheardFormat, cache_interactQueueSpeed, cache_limitPath, - cache_scriptEncoding, cache_debugPrefix; + cache_debugPrefix; - public static int cache_consoleWidth = 128, cache_trimLength = 1024, cache_whileMaxLoops, cache_blockTagsMaxBlocks, - cache_chatHistoryMaxMessages, cache_tagTimeout, cache_debugLimitPerTick; - - public static long cache_warningRate; + public static int cache_consoleWidth = 128, cache_trimLength = 1024, cache_blockTagsMaxBlocks, + cache_chatHistoryMaxMessages, cache_debugLimitPerTick; public static double cache_chatBystandersRange, cache_chatToNpcOverhearingRange; @@ -143,13 +140,6 @@ public static String getAlternateScriptPath() { return cache_getAlternateScriptPath; } - /** - * Whether Denizen should display debug in the console - */ - public static boolean showDebug() { - return cache_showDebug; - } - public static boolean overrideHelp() { return cache_overrideHelp; } @@ -170,18 +160,10 @@ public static boolean showExDebug() { return cache_showExDebug; } - public static boolean allowConsoleRedirection() { - return cache_allowConsoleRedirection; - } - public static boolean canRecordStats() { return cache_canRecordStats; } - public static boolean defaultDebugMode() { - return cache_defaultDebugMode; - } - public static int debugLimitPerTick() { return cache_debugLimitPerTick; } @@ -190,13 +172,6 @@ public static String debugPrefix() { return cache_debugPrefix; } - /** - * Sets the default speed between execution of commands in queues - */ - public static String scriptQueueSpeed() { - return cache_scriptQueueSpeed; - } - public static String interactQueueSpeed() { return cache_interactQueueSpeed; } @@ -261,14 +236,6 @@ public static String engageTimeoutInSeconds() { return cache_engageTimeoutInSeconds; } - public static int whileMaxLoops() { - return cache_whileMaxLoops; - } - - public static boolean allowWebget() { - return cache_allowWebget; - } - public static boolean allowStupids() { return allowStupid1() && allowStupid2() && allowStupid3(); } @@ -300,10 +267,6 @@ public static boolean allowStupidx() { .getBoolean("Commands.General.Don't change this unrestricted file access option though", false); } - public static boolean allowFilecopy() { - return cache_allowFilecopy; - } - public static boolean allowDelete() { return cache_allowDelete; } @@ -316,14 +279,6 @@ public static boolean allowServerRestart() { return cache_allowServerRestart; } - public static boolean allowLogging() { - return cache_allowLogging; - } - - public static boolean allowStrangeYAMLSaves() { - return cache_allowStrangeYAMLSaves; - } - public static String fileLimitPath() { return cache_limitPath; } @@ -434,21 +389,6 @@ public static int chatHistoryMaxMessages() { return cache_chatHistoryMaxMessages; } - public static int tagTimeout() { - return cache_tagTimeout; - } - - public static boolean tagTimeoutSilent() { - return cache_tagTimeoutSilent; - } - public static boolean tagTimeoutUnsafe() { - return cache_tagTimeoutUnsafe; - } - - public static long warningRate() { - return cache_warningRate; - } - public static boolean packetInterception() { return cache_packetInterception; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java index 99bd7d8aee..d7627fb48f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java @@ -14,6 +14,7 @@ import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.tags.TagManager; import com.denizenscript.denizencore.utilities.AsciiMatcher; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.denizenscript.denizencore.utilities.CoreUtilities; import com.denizenscript.denizencore.utilities.debugging.Debug; import net.citizensnpcs.api.CitizensAPI; @@ -108,7 +109,7 @@ public static boolean canReadFile(File f) { if (lown.endsWith("/")) { lown = lown.substring(0, lown.length() - 1); } - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log("Checking file canRead: " + lown); } if (lown.contains("denizen/secrets.secret")) { @@ -118,7 +119,7 @@ public static boolean canReadFile(File f) { if (dot != -1 && lown.substring(dot + 1).equals("secret")) { return false; } - if (!Settings.allowStrangeYAMLSaves() && + if (!CoreConfiguration.allowStrangeFileSaves && !f.getCanonicalPath().startsWith(new File(".").getCanonicalPath())) { return false; } @@ -173,10 +174,10 @@ public static boolean canWriteToFile(File f) { if (lown.endsWith("/")) { lown = lown.substring(0, lown.length() - 1); } - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.log("Checking file canWrite: " + lown); } - if (!Settings.allowStrangeYAMLSaves() && + if (!CoreConfiguration.allowStrangeFileSaves && !f.getCanonicalPath().startsWith(new File(".").getCanonicalPath())) { return false; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/DenizenCommandHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/DenizenCommandHandler.java index 7976d70537..03518e50e9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/DenizenCommandHandler.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/DenizenCommandHandler.java @@ -15,6 +15,7 @@ import com.denizenscript.denizencore.scripts.ScriptHelper; import com.denizenscript.denizencore.scripts.ScriptRegistry; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.denizenscript.denizencore.utilities.CoreUtilities; import com.denizenscript.denizencore.utilities.debugging.FutureWarning; import org.bukkit.command.CommandSender; @@ -175,16 +176,16 @@ public void debug(CommandContext args, CommandSender sender) throws CommandExcep if (!Debug.showDebug) { Debug.toggle(); } - com.denizenscript.denizencore.utilities.debugging.Debug.verbose = !com.denizenscript.denizencore.utilities.debugging.Debug.verbose; - Messaging.sendInfo(sender, (com.denizenscript.denizencore.utilities.debugging.Debug.verbose ? "Denizen debugger is now verbose." : + CoreConfiguration.debugVerbose = !CoreConfiguration.debugVerbose; + Messaging.sendInfo(sender, (CoreConfiguration.debugVerbose ? "Denizen debugger is now verbose." : "Denizen debugger verbosity disabled.")); } if (args.hasFlag('f')) { if (!Debug.showDebug) { Debug.toggle(); } - FutureWarning.futureWarningsEnabled = !FutureWarning.futureWarningsEnabled; - Messaging.sendInfo(sender, (FutureWarning.futureWarningsEnabled ? "Denizen debugger is now showing future warnings." : + CoreConfiguration.futureWarningsEnabled = !CoreConfiguration.futureWarningsEnabled; + Messaging.sendInfo(sender, (CoreConfiguration.futureWarningsEnabled ? "Denizen debugger is now showing future warnings." : "Denizen debugger future-warnings disabled.")); } if (args.hasFlag('n')) { @@ -227,8 +228,8 @@ public void debug(CommandContext args, CommandSender sender) throws CommandExcep if (!Debug.showDebug) { Debug.toggle(); } - com.denizenscript.denizencore.utilities.debugging.Debug.showLoading = !com.denizenscript.denizencore.utilities.debugging.Debug.showLoading; - Messaging.sendInfo(sender, (com.denizenscript.denizencore.utilities.debugging.Debug.showLoading ? "Denizen debugger is now showing script loading information." + CoreConfiguration.debugLoadingInfo = !CoreConfiguration.debugLoadingInfo; + Messaging.sendInfo(sender, (CoreConfiguration.debugLoadingInfo ? "Denizen debugger is now showing script loading information." : "Denizen debugger is no longer showing script loading information.")); } if (args.getFlags().isEmpty()) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/Debug.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/Debug.java index 36285fa0d1..3dbaf24321 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/Debug.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/Debug.java @@ -17,6 +17,7 @@ import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.scripts.queues.ScriptQueue; import com.denizenscript.denizencore.tags.TagContext; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.denizenscript.denizencore.utilities.debugging.Debuggable; import com.denizenscript.denizencore.utilities.debugging.Debug.DebugElement; import org.bukkit.Bukkit; @@ -148,7 +149,7 @@ public static void echoDebug(Debuggable caller, String message) { return; } echo(ChatColor.WHITE + trimMessage(message), caller); - if (com.denizenscript.denizencore.utilities.debugging.Debug.verbose && caller != null) { + if (CoreConfiguration.debugVerbose && caller != null) { echo(ChatColor.GRAY + "(Verbose) Caller = " + caller, caller); } } @@ -183,7 +184,7 @@ public static void echoError(ScriptEntry source, String message) { public static void echoError(ScriptEntry source, String addedContext, String message, boolean reformat) { message = cleanTextForDebugOutput(message); if (errorDuplicatePrevention) { - if (!com.denizenscript.denizencore.utilities.debugging.Debug.verbose) { + if (!CoreConfiguration.debugVerbose) { finalOutputDebugText("Error within error (??!!!! SOMETHING WENT SUPER WRONG!): " + message, source, reformat); } return; @@ -245,7 +246,7 @@ public static void echoError(ScriptEntry source, String addedContext, String mes } finalOutputDebugText(header + message + (showDebugSuffix ? ENABLE_DEBUG_MESSAGE : ""), sourceQueue, reformat); errorDuplicatePrevention = false; - if (com.denizenscript.denizencore.utilities.debugging.Debug.verbose && depthCorrectError == 0) { + if (CoreConfiguration.debugVerbose && depthCorrectError == 0) { depthCorrectError++; try { throw new RuntimeException("Verbose info for above error"); diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/DataPersistenceFlagTracker.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/DataPersistenceFlagTracker.java index 8ae71b63b1..8b76e195f6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/DataPersistenceFlagTracker.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/DataPersistenceFlagTracker.java @@ -7,6 +7,7 @@ import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.objects.core.MapTag; import com.denizenscript.denizencore.utilities.AsciiMatcher; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.NamespacedKey; import org.bukkit.persistence.PersistentDataHolder; @@ -60,7 +61,7 @@ public Collection listAllFlags() { public static NamespacedKey expireNeededKey = new NamespacedKey(Denizen.getInstance(), "expire_flag_check_needed"); public void doTotalClean() { - if (MapTagBasedFlagTracker.skipAllCleanings) { + if (CoreConfiguration.skipAllFlagCleanings) { return; } if (!holder.getPersistentDataContainer().has(expireNeededKey, PersistentDataType.STRING)) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/PlayerFlagHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/PlayerFlagHandler.java index 49705eee84..d613f62662 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/PlayerFlagHandler.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/PlayerFlagHandler.java @@ -1,6 +1,7 @@ package com.denizenscript.denizen.utilities.flags; import com.denizenscript.denizen.Denizen; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.denizenscript.denizencore.utilities.debugging.Debug; import com.denizenscript.denizencore.flags.AbstractFlagTracker; import com.denizenscript.denizencore.flags.SavableMapFlagTracker; @@ -153,7 +154,7 @@ public static AbstractFlagTracker getTrackerFor(UUID id) { cache = softRef.get(); if (cache != null) { cache.lastAccessed = System.currentTimeMillis(); - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.echoError("Verbose - flag tracker updated for " + id); } playerFlagTrackerCache.put(id, cache); @@ -164,7 +165,7 @@ public static AbstractFlagTracker getTrackerFor(UUID id) { cache = new CachedPlayerFlag(); cache.lastAccessed = System.currentTimeMillis(); cache.loadingNow = true; - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.echoError("Verbose - flag tracker updated for " + id); } playerFlagTrackerCache.put(id, cache); @@ -203,7 +204,7 @@ public static Future loadAsync(UUID id) { // Note: this method is called sync, b cache = softRef.get(); if (cache != null) { cache.lastAccessed = System.currentTimeMillis(); - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.echoError("Verbose - flag tracker updated for " + id); } playerFlagTrackerCache.put(id, cache); @@ -214,7 +215,7 @@ public static Future loadAsync(UUID id) { // Note: this method is called sync, b CachedPlayerFlag newCache = new CachedPlayerFlag(); newCache.lastAccessed = System.currentTimeMillis(); newCache.loadingNow = true; - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.echoError("Verbose - flag tracker updated for " + id); } playerFlagTrackerCache.put(id, newCache); diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java index 338e3ad563..9ef7a60d8c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java @@ -260,11 +260,6 @@ public void refreshScriptContainers() { ItemScriptHelper.item_scripts_by_hash_id.clear(); } - @Override - public String scriptQueueSpeed() { - return Settings.scriptQueueSpeed(); - } - @Override public TagContext getTagContext(ScriptContainer container) { return new BukkitTagContext(container); @@ -280,19 +275,6 @@ public ScriptEntryData getEmptyScriptEntryData() { return new BukkitScriptEntryData(null, null); } - @Override - public int getTagTimeout() { - if (!Settings.tagTimeoutUnsafe()) { - return 0; - } - return Settings.tagTimeout(); - } - - @Override - public boolean allowConsoleRedirection() { - return Settings.allowConsoleRedirection(); - } - @Override public String cleanseLogString(String input) { return cleanseLog(input); @@ -329,11 +311,6 @@ public static String cleanseLog(String input) { return input; } - @Override - public boolean allowedToWebget() { - return Settings.allowWebget(); - } - public static Thread tagThread = null; public static boolean isSafeThread() { @@ -362,21 +339,6 @@ public void postTagExecute() { } } - Boolean tTimeoutSil = null; - - @Override - public boolean tagTimeoutWhenSilent() { - if (tTimeoutSil == null) { - tTimeoutSil = Settings.tagTimeoutSilent(); - } - return tTimeoutSil; - } - - @Override - public boolean getDefaultDebugMode() { - return Settings.defaultDebugMode(); - } - @Override public boolean canWriteToFile(File f) { return Utilities.canWriteToFile(f); @@ -393,36 +355,16 @@ public String getRandomColor() { return DEBUG_FRIENDLY_COLORS[CoreUtilities.getRandom().nextInt(DEBUG_FRIENDLY_COLORS.length)].toString(); } - @Override - public int whileMaxLoops() { - return Settings.whileMaxLoops(); - } - - @Override - public boolean allowLogging() { - return Settings.allowLogging(); - } - @Override public boolean canReadFile(File f) { return Utilities.canReadFile(f); } - @Override - public boolean allowFileCopy() { - return Settings.allowFilecopy(); - } - @Override public File getDataFolder() { return Denizen.getInstance().getDataFolder(); } - @Override - public boolean allowStrangeYAMLSaves() { - return Settings.allowStrangeYAMLSaves(); - } - @Override public void startRecording() { Debug.record = true; diff --git a/pom.xml b/pom.xml index 75b185003b..e71334befd 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ UTF-8 1.18.2-R0.1-SNAPSHOT 2.0.29-SNAPSHOT - 1.90-SNAPSHOT + 1.90.1-SNAPSHOT Unknown CUSTOM 1.2.4 diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java index aff684c1ec..6bddeece1d 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java @@ -11,6 +11,7 @@ import com.denizenscript.denizen.nms.util.jnbt.Tag; import com.denizenscript.denizen.objects.ItemTag; import com.denizenscript.denizen.utilities.FormattedTextHelper; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.google.common.collect.Iterables; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; @@ -149,7 +150,7 @@ public PlayerProfile fillPlayerProfile(PlayerProfile playerProfile) { } } catch (Exception e) { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.echoError(e); } } diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/Handler.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/Handler.java index ccc036efa6..b5d76ca9f0 100644 --- a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/Handler.java +++ b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/Handler.java @@ -11,6 +11,7 @@ import com.denizenscript.denizen.nms.util.jnbt.Tag; import com.denizenscript.denizen.objects.ItemTag; import com.denizenscript.denizen.utilities.FormattedTextHelper; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.google.common.collect.Iterables; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; @@ -166,7 +167,7 @@ public PlayerProfile fillPlayerProfile(PlayerProfile playerProfile) { } } catch (Exception e) { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.echoError(e); } } diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java index e352b11022..4d2c00fb4c 100644 --- a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java +++ b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java @@ -24,6 +24,7 @@ import com.denizenscript.denizen.utilities.packets.DenizenPacketHandler; import com.denizenscript.denizen.utilities.packets.HideParticles; import com.denizenscript.denizencore.objects.core.ElementTag; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.mojang.datafixers.util.Pair; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; @@ -669,7 +670,7 @@ else if (packet instanceof ClientboundMoveEntityPacket.PosRot) { pNew = new ClientboundMoveEntityPacket.PosRot(newId, packet.getXa(), packet.getYa(), packet.getZa(), packet.getyRot(), packet.getxRot(), packet.isOnGround()); } else { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.echoError("Impossible move-entity packet class: " + packet.getClass().getCanonicalName()); } return; diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/Handler.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/Handler.java index 40e9771942..ec9d58f9c7 100644 --- a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/Handler.java +++ b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/Handler.java @@ -13,6 +13,7 @@ import com.denizenscript.denizen.objects.ItemTag; import com.denizenscript.denizen.utilities.AdvancedTextImpl; import com.denizenscript.denizen.utilities.FormattedTextHelper; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.google.common.collect.Iterables; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; @@ -170,7 +171,7 @@ public PlayerProfile fillPlayerProfile(PlayerProfile playerProfile) { } } catch (Exception e) { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.echoError(e); } } diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java index 4b82dd67da..21d2b7fb0f 100644 --- a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java +++ b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java @@ -25,6 +25,7 @@ import com.denizenscript.denizen.utilities.packets.DenizenPacketHandler; import com.denizenscript.denizen.utilities.packets.HideParticles; import com.denizenscript.denizencore.objects.core.ElementTag; +import com.denizenscript.denizencore.utilities.CoreConfiguration; import com.denizenscript.denizencore.utilities.CoreUtilities; import com.mojang.datafixers.util.Pair; import io.netty.buffer.Unpooled; @@ -719,7 +720,7 @@ else if (packet instanceof ClientboundMoveEntityPacket.PosRot) { pNew = new ClientboundMoveEntityPacket.PosRot(newId, packet.getXa(), packet.getYa(), packet.getZa(), packet.getyRot(), packet.getxRot(), packet.isOnGround()); } else { - if (Debug.verbose) { + if (CoreConfiguration.debugVerbose) { Debug.echoError("Impossible move-entity packet class: " + packet.getClass().getCanonicalName()); } return;