diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java index cefcd8f3f8..5ebdbeb570 100644 --- a/src/main/java/net/aufdemrand/denizen/Denizen.java +++ b/src/main/java/net/aufdemrand/denizen/Denizen.java @@ -170,7 +170,7 @@ public void onEnable() { versionTag = this.getDescription().getVersion(); // Load Denizen's core - DenizenCore.Init(this); + DenizenCore.init(this); // Activate dependencies depends.initialize(); @@ -359,6 +359,7 @@ public void onEnable() { @Override public void run() { try { + DenizenCore.loadScripts(); ScriptHelper.reloadScripts(); // Reload notables from notables.yml into memory @@ -622,7 +623,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String cmdName, Stri return true; } - if (Settings.ShowExHelp()) { + if (Settings.showExHelp()) { if (dB.showDebug) sender.sendMessage(ChatColor.YELLOW + "Executing dCommand... check the console for debug output!"); else diff --git a/src/main/java/net/aufdemrand/denizen/Settings.java b/src/main/java/net/aufdemrand/denizen/Settings.java index 1f8b7e0fbf..7948027ded 100644 --- a/src/main/java/net/aufdemrand/denizen/Settings.java +++ b/src/main/java/net/aufdemrand/denizen/Settings.java @@ -28,12 +28,12 @@ public static String getAlternateScriptPath() { */ - public static boolean ShowDebug() { + public static boolean showDebug() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Debug.Show", false); } - public static int ConsoleWidth() { + public static int consoleWidth() { return DenizenAPI.getCurrentInstance().getConfig() .getInt("Debug.Console width", 60); } @@ -43,7 +43,7 @@ public static int trimLength() { .getInt("Debug.trim length", 512); } - public static boolean ShowExHelp() { + public static boolean showExHelp() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Debug.Ex command help", true); } @@ -54,7 +54,7 @@ public static boolean ShowExHelp() { */ - public static String ScriptQueueSpeed() { + public static String scriptQueueSpeed() { String delay = DenizenAPI.getCurrentInstance().getConfig() .getString("Scripts.Queue speed", "0.5s"); @@ -71,7 +71,7 @@ public static String ScriptQueueSpeed() { */ - public static boolean LoadScriptsInSubfolders() { + public static boolean loadScriptsInSubfolders() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Scripts.Load scripts in subfolders", true); } @@ -82,7 +82,7 @@ public static boolean LoadScriptsInSubfolders() { */ - public static boolean HealthTraitEnabledByDefault() { + public static boolean healthTraitEnabledByDefault() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Traits.Health.Enabled", false); } @@ -93,7 +93,7 @@ public static boolean HealthTraitEnabledByDefault() { */ - public static boolean HealthTraitRespawnEnabled() { + public static boolean healthTraitRespawnEnabled() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Traits.Health.Respawn.Enabled", true); } @@ -104,7 +104,7 @@ public static boolean HealthTraitRespawnEnabled() { */ - public static boolean HealthTraitAnimatedDeathEnabled() { + public static boolean healthTraitAnimatedDeathEnabled() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Traits.Health.Animated death.Enabled", true); } @@ -115,7 +115,7 @@ public static boolean HealthTraitAnimatedDeathEnabled() { */ - public static String HealthTraitRespawnDelay() { + public static String healthTraitRespawnDelay() { return DenizenAPI.getCurrentInstance().getConfig() .getString("Traits.Health.Respawn.Delay", "10s"); } @@ -126,7 +126,7 @@ public static String HealthTraitRespawnDelay() { */ - public static boolean TriggerEnabled(String triggerName) { + public static boolean triggerEnabled(String triggerName) { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase() + triggerName.substring(1).toLowerCase() + ".Enabled", true); } @@ -138,7 +138,7 @@ public static boolean TriggerEnabled(String triggerName) { */ - public static double TriggerDefaultCooldown(String triggerName) { + public static double triggerDefaultCooldown(String triggerName) { return Duration.valueOf(DenizenAPI.getCurrentInstance().getConfig() .getString("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase() + triggerName.substring(1).toLowerCase() + ".Cooldown", "5s")).getSeconds(); } @@ -151,7 +151,7 @@ public static double TriggerDefaultCooldown(String triggerName) { */ - public static double TriggerDefaultRange(String triggerName) { + public static double triggerDefaultRange(String triggerName) { return DenizenAPI.getCurrentInstance().getConfig() .getDouble("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase() + triggerName.substring(1).toLowerCase() + ".Range", -1); } @@ -163,7 +163,7 @@ public static double TriggerDefaultRange(String triggerName) { */ - public static String TriggerDefaultCooldownType(String triggerName) { + public static String triggerDefaultCooldownType(String triggerName) { return DenizenAPI.getCurrentInstance().getConfig() .getString("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase() + triggerName.substring(1).toLowerCase() + ".Cooldown Type", "Player"); } @@ -181,7 +181,7 @@ public static String TriggerDefaultCooldownType(String triggerName) { */ - public static boolean ClickTriggerAllowsLeftClick() { // TODO: Remove? + public static boolean clickTriggerAllowsLeftClick() { // TODO: Remove? return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Triggers.Click.Allows left click", false); } @@ -194,42 +194,42 @@ public static boolean ClickTriggerAllowsLeftClick() { // TODO: Remove? */ - public static String EngageTimeoutInSeconds() { + public static String engageTimeoutInSeconds() { return DenizenAPI.getCurrentInstance().getConfig() .getString("Commands.Engage.Timeout", "150s"); } - public static int WhileMaxLoops() { + public static int whileMaxLoops() { return DenizenAPI.getCurrentInstance().getConfig() .getInt("Commands.While.Max loops", 10000); } - public static String ChatMultipleTargetsFormat() { + public static String chatMultipleTargetsFormat() { return DenizenAPI.getCurrentInstance().getConfig() .getString("Commands.Chat.Options.Multiple targets format", "%target%, %target%, %target%, and others"); } - public static double ChatBystandersRange() { + public static double chatBystandersRange() { return DenizenAPI.getCurrentInstance().getConfig() .getDouble("Commands.Chat.Options.Range for bystanders", 5.0); } - public static String ChatNoTargetFormat() { + public static String chatNoTargetFormat() { return DenizenAPI.getCurrentInstance().getConfig() .getString("Commands.Chat.Formats.No target", "[]: "); } - public static String ChatToTargetFormat() { + public static String chatToTargetFormat() { return DenizenAPI.getCurrentInstance().getConfig() .getString("Commands.Chat.Formats.To target", "[] -> You: "); } - public static String ChatWithTargetToBystandersFormat() { + public static String chatWithTargetToBystandersFormat() { return DenizenAPI.getCurrentInstance().getConfig() .getString("Commands.Chat.Formats.With target to bystanders", "[] -> : "); } - public static String ChatWithTargetsToBystandersFormat() { + public static String chatWithTargetsToBystandersFormat() { return DenizenAPI.getCurrentInstance().getConfig() .getString("Commands.Chat.Formats.With targets to bystanders", "[] -> []: "); } @@ -241,7 +241,7 @@ public static String ChatWithTargetsToBystandersFormat() { */ - public static boolean ChatAsynchronous() { + public static boolean chatAsynchronous() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Triggers.Chat.Use asynchronous event", false); } @@ -253,12 +253,12 @@ public static boolean ChatAsynchronous() { */ - public static String ChatToNpcFormat() { + public static String chatToNpcFormat() { return DenizenAPI.getCurrentInstance().getConfig() .getString("Triggers.Chat.Formats.Player to NPC", "You -> : "); } - public static String ChatToNpcOverheardFormat() { + public static String chatToNpcOverheardFormat() { return DenizenAPI.getCurrentInstance().getConfig() .getString("Triggers.Chat.Formats.Player to NPC overheard", " -> : "); } @@ -270,7 +270,7 @@ public static String ChatToNpcOverheardFormat() { */ - public static double ChatToNpcOverhearingRange() { + public static double chatToNpcOverhearingRange() { return DenizenAPI.getCurrentInstance().getConfig() .getDouble("Triggers.Chat.Overhearing range", 4); } @@ -282,12 +282,12 @@ public static double ChatToNpcOverhearingRange() { */ - public static boolean ChatMustSeeNPC() { + public static boolean chatMustSeeNPC() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Triggers.Chat.Prerequisites.Must be able to see NPC", true); } - public static boolean ChatMustLookAtNPC() { + public static boolean chatMustLookAtNPC() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Triggers.Chat.Prerequisites.Must be looking in direction of NPC", true); } @@ -299,17 +299,17 @@ public static boolean ChatMustLookAtNPC() { */ - public static boolean ChatGloballyIfFailedChatTriggers() { + public static boolean chatGloballyIfFailedChatTriggers() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Triggers.Chat.Appears globally.If triggers failed", false); } - public static boolean ChatGloballyIfNoChatTriggers() { + public static boolean chatGloballyIfNoChatTriggers() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Triggers.Chat.Appears globally.If triggers missing", true); } - public static boolean ChatGloballyIfUninteractable() { + public static boolean chatGloballyIfUninteractable() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Triggers.Chat.Appears globally.If NPC uninteractable", true); } @@ -326,7 +326,7 @@ public static boolean ChatGloballyIfUninteractable() { */ - public static boolean WorldScriptChatEventAsynchronous() { + public static boolean worldScriptChatEventAsynchronous() { return DenizenAPI.getCurrentInstance().getConfig() .getBoolean("Scripts.World.Events.On player chats.Use asynchronous event", false); } @@ -338,7 +338,7 @@ public static boolean WorldScriptChatEventAsynchronous() { */ - public static Duration WorldScriptTimeEventFrequency() { + public static Duration worldScriptTimeEventFrequency() { return Duration.valueOf(DenizenAPI.getCurrentInstance().getConfig() .getString("Scripts.World.Events.On time changes.Frequency of check", "250t")); diff --git a/src/main/java/net/aufdemrand/denizen/events/EventManager.java b/src/main/java/net/aufdemrand/denizen/events/EventManager.java index 2a8b5de45b..92a6e8f934 100644 --- a/src/main/java/net/aufdemrand/denizen/events/EventManager.java +++ b/src/main/java/net/aufdemrand/denizen/events/EventManager.java @@ -184,7 +184,7 @@ public static List trimEvents(List original) { } - public static boolean EventExists(String original) { + public static boolean eventExists(String original) { return events.containsKey("ON " + original.toUpperCase()); } diff --git a/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java b/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java index 85e960c910..9ec972c6e6 100644 --- a/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java @@ -256,7 +256,7 @@ public String getValue() { if (value_tagged) return value; value_tagged = true; - value = TagManager.CleanOutputFully(TagManager.tag( + value = TagManager.cleanOutputFully(TagManager.tag( getPlayer(), getNPC(), value, false, getScriptEntry())); return value; } @@ -271,7 +271,7 @@ public String getAlternative() { if (alternative_tagged) return alternative; alternative_tagged = true; - alternative = TagManager.CleanOutputFully(TagManager.tag( + alternative = TagManager.cleanOutputFully(TagManager.tag( getPlayer(), getNPC(), alternative, false, getScriptEntry())); return alternative; } diff --git a/src/main/java/net/aufdemrand/denizen/events/core/AsyncChatSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/AsyncChatSmartEvent.java index 26254d8f09..21ca73557c 100644 --- a/src/main/java/net/aufdemrand/denizen/events/core/AsyncChatSmartEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/core/AsyncChatSmartEvent.java @@ -38,7 +38,7 @@ public class AsyncChatSmartEvent implements SmartEvent, Listener { public boolean shouldInitialize(Set events) { // Fail if "Use asynchronous event" is false in config file - if (!Settings.WorldScriptChatEventAsynchronous()) return false; + if (!Settings.worldScriptChatEventAsynchronous()) return false; // Loop through event names from loaded world script events for (String event : events) { diff --git a/src/main/java/net/aufdemrand/denizen/events/core/SyncChatSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/SyncChatSmartEvent.java index ed56e927c6..4621a2e687 100644 --- a/src/main/java/net/aufdemrand/denizen/events/core/SyncChatSmartEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/core/SyncChatSmartEvent.java @@ -34,7 +34,7 @@ public class SyncChatSmartEvent implements SmartEvent, Listener { public boolean shouldInitialize(Set events) { // Fail if "Use asynchronous event" is true in config file - if (Settings.WorldScriptChatEventAsynchronous()) return false; + if (Settings.worldScriptChatEventAsynchronous()) return false; // Loop through event names from loaded world script events for (String event : events) { diff --git a/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java b/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java index 43f4be2a96..fbb866cddb 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java +++ b/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java @@ -51,14 +51,14 @@ public void talk(SpeechContext speechContext) { // Chat to the world using Denizen chat settings if (!context.hasRecipients()) { - String text = TagManager.tag(entry.getPlayer(), entry.getNPC(), Settings.ChatNoTargetFormat(), false, entry); + String text = TagManager.tag(entry.getPlayer(), entry.getNPC(), Settings.chatNoTargetFormat(), false, entry); talkToBystanders(talker, text, context); } // Single recipient else if (context.size() <= 1) { // Send chat to target - String text = TagManager.tag(entry.getPlayer(), entry.getNPC(), Settings.ChatToTargetFormat(), false, entry); + String text = TagManager.tag(entry.getPlayer(), entry.getNPC(), Settings.chatToTargetFormat(), false, entry); for (Talkable entity : context) { entity.talkTo(context, text, this); } @@ -69,7 +69,7 @@ else if (context.size() <= 1) { defTarget = queue.getDefinition("target"); queue.addDefinition("target", new dEntity(context.iterator().next().getEntity()).identify()); String bystanderText = TagManager.tag(entry.getPlayer(), entry.getNPC(), - Settings.ChatWithTargetToBystandersFormat(), false, entry); + Settings.chatWithTargetToBystandersFormat(), false, entry); talkToBystanders(talker, bystanderText, context); if (defTarget != null) queue.addDefinition("target", defTarget); @@ -79,12 +79,12 @@ else if (context.size() <= 1) { // Multiple recipients else { // Send chat to targets - String text = TagManager.tag(entry.getPlayer(), entry.getNPC(), Settings.ChatToTargetFormat(), false, entry); + String text = TagManager.tag(entry.getPlayer(), entry.getNPC(), Settings.chatToTargetFormat(), false, entry); for (Talkable entity : context) { entity.talkTo(context, text, this); } if (context.isBystandersEnabled()) { - String[] format = Settings.ChatMultipleTargetsFormat().split("%target%"); + String[] format = Settings.chatMultipleTargetsFormat().split("%target%"); if (format.length <= 1) dB.echoError("Invalid 'Commands.Chat.Options.Multiple targets format' in config.yml! Must have at least 1 %target%"); StringBuilder parsed = new StringBuilder(); @@ -106,7 +106,7 @@ else if (context.size() <= 1) { queue.addDefinition("targets", targets); String bystanderText = TagManager.tag(entry.getPlayer(), entry.getNPC(), - Settings.ChatWithTargetsToBystandersFormat(), false, entry); + Settings.chatWithTargetsToBystandersFormat(), false, entry); talkToBystanders(talker, bystanderText, context); if (defTargets != null) diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/AssignmentTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/AssignmentTrait.java index 7d4d20b5e9..fc29a4aec3 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/traits/AssignmentTrait.java +++ b/src/main/java/net/aufdemrand/denizen/npc/traits/AssignmentTrait.java @@ -72,7 +72,7 @@ public boolean setAssignment(String assignment, dPlayer player) { // Add Constants/Trigger trait if not already added to the NPC. if (!npc.hasTrait(ConstantsTrait.class)) npc.addTrait(ConstantsTrait.class); if (!npc.hasTrait(TriggerTrait.class)) npc.addTrait(TriggerTrait.class); - if (Settings.HealthTraitEnabledByDefault()) + if (Settings.healthTraitEnabledByDefault()) if (!npc.hasTrait(HealthTrait.class)) npc.addTrait(HealthTrait.class); // Reset Constants npc.getTrait(ConstantsTrait.class).rebuildAssignmentConstants(); diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java index 5c71aee3c2..d1454764eb 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java +++ b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java @@ -31,13 +31,13 @@ public class HealthTrait extends Trait implements Listener { // Saved to the C2 saves.yml @Persist("animatedeath") - private boolean animatedeath = Settings.HealthTraitAnimatedDeathEnabled(); + private boolean animatedeath = Settings.healthTraitAnimatedDeathEnabled(); @Persist("respawnondeath") - private boolean respawn = Settings.HealthTraitRespawnEnabled(); + private boolean respawn = Settings.healthTraitRespawnEnabled(); @Persist("respawndelayinseconds") - private String respawnDelay = Settings.HealthTraitRespawnDelay(); + private String respawnDelay = Settings.healthTraitRespawnDelay(); @Persist("respawnlocation") private String respawnLocation = ">"; diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/TriggerTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/TriggerTrait.java index e532be9a74..425ebd8e96 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/traits/TriggerTrait.java +++ b/src/main/java/net/aufdemrand/denizen/npc/traits/TriggerTrait.java @@ -47,14 +47,14 @@ public TriggerTrait() { super("triggers"); for (String triggerName : DenizenAPI.getCurrentInstance().getTriggerRegistry().list().keySet()) if (!enabled.containsKey(triggerName)) - enabled.put(triggerName, Settings.TriggerEnabled(triggerName)); + enabled.put(triggerName, Settings.triggerEnabled(triggerName)); } public void onSpawn() { for (String triggerName : DenizenAPI.getCurrentInstance().getTriggerRegistry().list().keySet()) if (!enabled.containsKey(triggerName)) - enabled.put(triggerName, Settings.TriggerEnabled(triggerName)); + enabled.put(triggerName, Settings.triggerEnabled(triggerName)); } @@ -108,7 +108,7 @@ public void setLocalCooldown(String triggerName, double value) { public double getCooldownDuration(String triggerName) { if (duration.containsKey(triggerName.toUpperCase())) return duration.get(triggerName.toUpperCase()); - else return Settings.TriggerDefaultCooldown(triggerName); + else return Settings.triggerDefaultCooldown(triggerName); } @@ -116,7 +116,7 @@ public CooldownType getCooldownType(String triggerName) { try { if (type.containsKey(triggerName.toUpperCase())) return type.get(triggerName.toUpperCase()); - else return CooldownType.valueOf(Settings.TriggerDefaultCooldownType(triggerName).toUpperCase()); + else return CooldownType.valueOf(Settings.triggerDefaultCooldownType(triggerName).toUpperCase()); } catch (Exception e) { return CooldownType.PLAYER; } } @@ -129,7 +129,7 @@ public void setLocalRadius(String triggerName, int value) { public double getRadius(String triggerName) { if (radius.containsKey(triggerName.toUpperCase())) return radius.get(triggerName.toUpperCase()); - else return Settings.TriggerDefaultRange(triggerName); + else return Settings.triggerDefaultRange(triggerName); } diff --git a/src/main/java/net/aufdemrand/denizen/objects/Element.java b/src/main/java/net/aufdemrand/denizen/objects/Element.java index 38a371fc52..b3a6258d15 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/Element.java +++ b/src/main/java/net/aufdemrand/denizen/objects/Element.java @@ -107,7 +107,7 @@ public Element(String string) { if (string == null) this.element = "null"; else - this.element = TagManager.CleanOutputFully(string); + this.element = TagManager.cleanOutputFully(string); } public Element(Boolean bool) { @@ -148,7 +148,7 @@ public Element(Float flt) { public Element(String prefix, String string) { if (prefix == null) this.prefix = "element"; else this.prefix = prefix; - this.element = TagManager.CleanOutputFully(string); + this.element = TagManager.cleanOutputFully(string); } public double asDouble() { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptHelper.java index 4115f27599..50d0f052e8 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/ScriptHelper.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/ScriptHelper.java @@ -151,7 +151,7 @@ private static String _concatenateCoreScripts() { // Get files using script directory - List files = Utilities.listDScriptFiles(file, Settings.LoadScriptsInSubfolders()); + List files = Utilities.listDScriptFiles(file, Settings.loadScriptsInSubfolders()); if (files.size() > 0) { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java index 8eac4af2f2..76e9798999 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java @@ -127,7 +127,7 @@ public boolean execute(ScriptEntry scriptEntry) { m = definition_pattern.matcher(arg.raw_value); sb = new StringBuffer(); while (m.find()) { - String definition = TagManager.EscapeOutput(scriptEntry.getResidingQueue().getDefinition(m.group(1))); + String definition = TagManager.escapeOutput(scriptEntry.getResidingQueue().getDefinition(m.group(1))); if (definition == null) { dB.echoError("Unknown definition %" + m.group(1) + "%."); definition = "null"; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LogCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LogCommand.java index bb701b3d4c..d7a8e1149e 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LogCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LogCommand.java @@ -63,7 +63,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { String directory = URLDecoder.decode(System.getProperty("user.dir")); File file = new File(directory, fileName.asString()); - String output = TagManager.CleanOutputFully(message.asString()); + String output = TagManager.cleanOutputFully(message.asString()); if (type == Type.NONE) { try { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java index a5735ba8a3..a0164ea54e 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java @@ -147,7 +147,7 @@ else if (callback != null && callback.asBoolean()) { data.index++; if (System.currentTimeMillis() - data.LastChecked < 50) { data.instaTicks++; - int max = Settings.WhileMaxLoops(); + int max = Settings.whileMaxLoops(); if (data.instaTicks > max && max != 0) return; } diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/EngageCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/EngageCommand.java index 76a589f6aa..7d08811587 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/EngageCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/EngageCommand.java @@ -100,7 +100,7 @@ public static boolean getEngaged(NPC npc) { */ public static void setEngaged(NPC npc, boolean engaged) { if (engaged) currentlyEngaged.put(npc, System.currentTimeMillis() - + (long) (Duration.valueOf(Settings.EngageTimeoutInSeconds()).getSeconds()) * 1000 ); + + (long) (Duration.valueOf(Settings.engageTimeoutInSeconds()).getSeconds()) * 1000 ); if (!engaged) currentlyEngaged.remove(npc); } diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ChatCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ChatCommand.java index dd659e757e..78e386714b 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ChatCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ChatCommand.java @@ -104,7 +104,7 @@ else if (!scriptEntry.hasObject("message")) if (!scriptEntry.hasObject("message")) throw new InvalidArgumentsException("Must specify a message!"); - scriptEntry.defaultObject("range", new Element(Settings.ChatBystandersRange())); + scriptEntry.defaultObject("range", new Element(Settings.chatBystandersRange())); } @@ -119,7 +119,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { dB.report(scriptEntry, getName(), talkers.debug() + targets.debug() + message.debug() + chatRange.debug()); // Create new speech context - DenizenSpeechContext context = new DenizenSpeechContext(TagManager.CleanOutputFully(message.asString()), + DenizenSpeechContext context = new DenizenSpeechContext(TagManager.cleanOutputFully(message.asString()), scriptEntry, chatRange.asDouble()); if (!targets.isEmpty()) { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/player/NarrateCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/player/NarrateCommand.java index 338f12c6ee..574cc528f3 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/player/NarrateCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/player/NarrateCommand.java @@ -50,7 +50,7 @@ else if (!scriptEntry.hasObject("targets") // Use raw_value as to not accidentally strip a value before any :'s. else if (!scriptEntry.hasObject("text")) - scriptEntry.addObject("text", new Element(TagManager.CleanOutputFully(arg.raw_value))); + scriptEntry.addObject("text", new Element(TagManager.cleanOutputFully(arg.raw_value))); else arg.reportUnhandled(); diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/TaskScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/TaskScriptContainer.java index cec89b861c..98a6f7ce3e 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/TaskScriptContainer.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/TaskScriptContainer.java @@ -33,7 +33,7 @@ public Duration getSpeed() { speed = Duration.valueOf(getString("SPEED", "0t")); } else - speed = new Duration(Duration.valueOf(Settings.ScriptQueueSpeed()).getSeconds()); + speed = new Duration(Duration.valueOf(Settings.scriptQueueSpeed()).getSeconds()); return speed; } diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java index e2b4dc3c64..8b2ec60f53 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java @@ -988,13 +988,14 @@ else if (determination.length() > 0 && !determination.equalsIgnoreCase("none")) // --> public void serverStartEvent() { // Start the 'timeEvent' + long ticks = Settings.worldScriptTimeEventFrequency().getTicks(); Bukkit.getScheduler().scheduleSyncRepeatingTask(DenizenAPI.getCurrentInstance(), new Runnable() { @Override public void run() { timeEvent(); } - }, Settings.WorldScriptTimeEventFrequency().getTicks(), Settings.WorldScriptTimeEventFrequency().getTicks()); + }, ticks, ticks); // Fire the 'Server Start' event String determination = EventManager.doEvents(Arrays.asList("server start"), diff --git a/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java b/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java index 0650e0757c..29f50313fd 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java @@ -528,11 +528,11 @@ public void callBack(Runnable r) { private String breakMe = null; - public void BreakLoop(String toBreak) { + public void breakLoop(String toBreak) { breakMe = toBreak; } - public String IsLoopBroken() { + public String isLoopBroken() { return breakMe; } diff --git a/src/main/java/net/aufdemrand/denizen/scripts/queues/core/TimedQueue.java b/src/main/java/net/aufdemrand/denizen/scripts/queues/core/TimedQueue.java index c087a4a838..a31c25ca67 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/queues/core/TimedQueue.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/queues/core/TimedQueue.java @@ -38,7 +38,7 @@ public static TimedQueue getQueue(String id) { // If not, create a new one. else { scriptQueue = new TimedQueue(id, - Duration.valueOf(Settings.ScriptQueueSpeed())); + Duration.valueOf(Settings.scriptQueueSpeed())); } // Return the queue return scriptQueue; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java index 0a3dc91f58..03fc8f3b5d 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java @@ -80,10 +80,10 @@ public ChatContext process(Player player, String message) { // reduce accidental chats with NPCs. - if (Settings.ChatMustSeeNPC()) + if (Settings.chatMustSeeNPC()) if (!player.hasLineOfSight(npc.getEntity())) return new ChatContext(false); - if (Settings.ChatMustLookAtNPC()) + if (Settings.chatMustLookAtNPC()) if (!Rotation.isFacingEntity(player, npc.getEntity(), 45)) return new ChatContext(false); Boolean ret = false; @@ -115,7 +115,7 @@ public ChatContext process(Player player, String message) { if (!trigger.wasTriggered()) { // If the NPC is not interact-able, Settings may allow the chat to filter // through. Check the Settings if this is enabled. - if (Settings.ChatGloballyIfUninteractable()) { + if (Settings.chatGloballyIfUninteractable()) { dB.echoDebug(script, ChatColor.YELLOW + "Resuming. " + ChatColor.WHITE + "The NPC is currently cooling down or engaged."); return new ChatContext(false); @@ -148,13 +148,13 @@ public ChatContext process(Player player, String message) { // If this is a Chatbot, make it chat anything it wants if // it has no chat triggers for this step if (npc.getCitizen().hasTrait(ChatbotTrait.class)) { - Utilities.talkToNPC(message, denizenPlayer, npc, Settings.ChatToNpcOverhearingRange()); + Utilities.talkToNPC(message, denizenPlayer, npc, Settings.chatToNpcOverhearingRange()); npc.getCitizen().getTrait(ChatbotTrait.class).chatTo(player, message); return new ChatContext(false); } // No chat trigger for this step.. do we chat globally, or to the NPC? - else if (!Settings.ChatGloballyIfNoChatTriggers()) { + else if (!Settings.chatGloballyIfNoChatTriggers()) { dB.echoDebug(script, player.getName() + " says to " + npc.getNicknameTrait().getNickname() + ", " + message); return new ChatContext(false); @@ -242,7 +242,7 @@ else if (message.toUpperCase().contains(keyword.toUpperCase())) // If there was a match, the id of the match should have been returned. if (id != null) { - Utilities.talkToNPC(replacementText, denizenPlayer, npc, Settings.ChatToNpcOverhearingRange()); + Utilities.talkToNPC(replacementText, denizenPlayer, npc, Settings.chatToNpcOverhearingRange()); parse(npc, denizenPlayer, script, id, context); return new ChatContext(true); } @@ -250,12 +250,12 @@ else if (message.toUpperCase().contains(keyword.toUpperCase())) // If this is a Chatbot, make it chat anything it wants if // none of its chat triggers worked if (npc.getCitizen().hasTrait(ChatbotTrait.class)) { - Utilities.talkToNPC(message, denizenPlayer, npc, Settings.ChatToNpcOverhearingRange()); + Utilities.talkToNPC(message, denizenPlayer, npc, Settings.chatToNpcOverhearingRange()); npc.getCitizen().getTrait(ChatbotTrait.class).chatTo(player, message); return new ChatContext(true); } - else if (!Settings.ChatGloballyIfFailedChatTriggers ()) { - Utilities.talkToNPC(message, denizenPlayer, npc, Settings.ChatToNpcOverhearingRange()); + else if (!Settings.chatGloballyIfFailedChatTriggers ()) { + Utilities.talkToNPC(message, denizenPlayer, npc, Settings.chatToNpcOverhearingRange()); return new ChatContext(true); } // No matching chat triggers, and the config.yml says we @@ -270,7 +270,7 @@ public void asyncChatTrigger(final AsyncPlayerChatEvent event) { if (event.isCancelled()) return; // Return if "Use asynchronous event" is false in config file - if (!Settings.ChatAsynchronous()) return; + if (!Settings.chatAsynchronous()) return; Callable call = new Callable() { public ChatContext call() { @@ -309,7 +309,7 @@ public void syncChatTrigger(final PlayerChatEvent event) { if (event.isCancelled()) return; // Return if "Use asynchronous event" is true in config file - if (Settings.ChatAsynchronous()) return; + if (Settings.chatAsynchronous()) return; ChatContext chat = process(event.getPlayer(), event.getMessage()); diff --git a/src/main/java/net/aufdemrand/denizen/tags/Attribute.java b/src/main/java/net/aufdemrand/denizen/tags/Attribute.java index d9ed9413b9..1709db0795 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/Attribute.java +++ b/src/main/java/net/aufdemrand/denizen/tags/Attribute.java @@ -165,7 +165,7 @@ public String getContext(int attribute) { Matcher contextMatcher = CONTEXT_PATTERN.matcher(text); if (contextMatcher.find()) { - String tagged = TagManager.CleanOutputFully(TagManager.tag( + String tagged = TagManager.cleanOutputFully(TagManager.tag( getPlayer(), getNPC(), text.substring(contextMatcher.start() + 1, contextMatcher.end() - 1), false, getScriptEntry())); contexts.set(attribute - 1, tagged); diff --git a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java index e5d6436877..668f1b359b 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java +++ b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java @@ -89,7 +89,7 @@ public void registerCoreTags() { * @param input the potentially escaped input string. * @return the cleaned output string. */ - public static String CleanOutput(String input) { + public static String cleanOutput(String input) { if (input == null) return null; return input.replace((char)0x01, '<') .replace((char)0x02, '>') @@ -109,7 +109,7 @@ public static String CleanOutput(String input) { * @param input the potentially escaped input string. * @return the cleaned output string. */ - public static String CleanOutputFully(String input) { + public static String cleanOutputFully(String input) { if (input == null) return null; return input.replace((char)0x01, '<') .replace((char)0x02, '>') @@ -120,7 +120,7 @@ public static String CleanOutputFully(String input) { .replace((char)0x06, ']'); } - public static String EscapeOutput(String input) { + public static String escapeOutput(String input) { if (input == null) return null; return input.replace('|', dList.internal_escape_char) .replace('<', (char)0x01) @@ -198,7 +198,7 @@ public static String tag(String arg, TagContext context) { if (arg == null) return null; // confirm there are/is a replaceable TAG(s), if not, return the arg. - if (arg.indexOf('>') == -1 || arg.length() < 3) return CleanOutput(arg); + if (arg.indexOf('>') == -1 || arg.length() < 3) return cleanOutput(arg); // Parse \escaping down to internal escaping. if (!context.instant) arg = arg.replace("\\<", String.valueOf((char)0x01)).replace("\\>", String.valueOf((char)0x02)); @@ -206,7 +206,7 @@ public static String tag(String arg, TagContext context) { // Find location of the first tag int[] positions = locateTag(arg); if (positions == null) { - return CleanOutput(arg); + return cleanOutput(arg); } int failsafe = 0; @@ -221,7 +221,7 @@ public static String tag(String arg, TagContext context) { if (event.isInstant() != context.instant) { // Not the right type of tag, escape the brackets so it doesn't get parsed again arg = arg.substring(0, positions[0]) + String.valueOf((char)0x01) - + EscapeOutput(event.getReplaced()) + String.valueOf((char)0x02) + arg.substring(positions[1] + 1, arg.length()); + + escapeOutput(event.getReplaced()) + String.valueOf((char)0x02) + arg.substring(positions[1] + 1, arg.length()); } else { // Call Event Bukkit.getServer().getPluginManager().callEvent(event); @@ -233,14 +233,14 @@ public static String tag(String arg, TagContext context) { event.getReplaced() + "'."); if (!event.replaced()) dB.echoError("Tag '" + event.getReplaced() + "' is invalid!"); - arg = arg.substring(0, positions[0]) + EscapeOutput(event.getReplaced()) + arg.substring(positions[1] + 1, arg.length()); + arg = arg.substring(0, positions[0]) + escapeOutput(event.getReplaced()) + arg.substring(positions[1] + 1, arg.length()); } } // Find new tag positions = locateTag(arg); } while (positions != null || failsafe < 50); - return CleanOutput(arg); + return cleanOutput(arg); } private static int[] locateTag(String arg) { diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/EscapeTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/EscapeTags.java index 35f3901edf..09ffe1992e 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/EscapeTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/EscapeTags.java @@ -56,7 +56,7 @@ public EscapeTags(Denizen denizen) { public static String Escape(String input) { if (input == null) return null; - return TagManager.CleanOutputFully(input) + return TagManager.cleanOutputFully(input) .replace("&", "&").replace("|", "&pipe") .replace(">", ">").replace("<", "<") .replace("\n", "&nl").replace(";", "&sc") @@ -76,7 +76,7 @@ public static String Escape(String input) { public static String unEscape(String input) { if (input == null) return null; - return TagManager.CleanOutputFully(input) + return TagManager.cleanOutputFully(input) .replace("&pipe", "|").replace("&nl", "\n") .replace(">", ">").replace("<", "<") .replace("&sc", ";").replace("&sq", "'") diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ParseTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/ParseTags.java index 105804492a..c6a9f2a0b9 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/ParseTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/ParseTags.java @@ -31,7 +31,7 @@ public void parseTags(ReplaceableTagEvent event) { return; } ScriptEntry se = event.getAttributes().getScriptEntry(); - String read = TagManager.tag(se.getPlayer(), se.getNPC(), TagManager.CleanOutputFully(event.getValue()), false, se); + String read = TagManager.tag(se.getPlayer(), se.getNPC(), TagManager.cleanOutputFully(event.getValue()), false, se); event.setReplaced(new Element(read).getAttribute(event.getAttributes().fulfill(1))); } } diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java index 1b499211db..73d5e77f31 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java @@ -201,8 +201,8 @@ public void serverTag(ReplaceableTagEvent event) { // --> if (attribute.startsWith("has_event") && attribute.hasContext(1)) { - event.setReplaced(new Element(EventManager.EventExists(attribute.getContext(1)) - || EventManager.EventExists(EventManager.StripIdentifiers(attribute.getContext(1)))) + event.setReplaced(new Element(EventManager.eventExists(attribute.getContext(1)) + || EventManager.eventExists(EventManager.StripIdentifiers(attribute.getContext(1)))) .getAttribute(attribute.fulfill(1))); } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java index 6d4eb8fc0d..3196f01341 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java @@ -111,9 +111,9 @@ public static String[] wrapWords(String text, int width) { public static void talkToNPC(String message, dPlayer player, dNPC npc, double range) { String replacer = String.valueOf((char)0x04); // Get formats from Settings, and fill in - String talkFormat = Settings.ChatToNpcFormat() + String talkFormat = Settings.chatToNpcFormat() .replaceAll("(?i)", replacer); - String bystanderFormat = Settings.ChatToNpcOverheardFormat() + String bystanderFormat = Settings.chatToNpcOverheardFormat() .replaceAll("(?i)", replacer); // Fill in tags diff --git a/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java b/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java index c26cb12273..b9d737e797 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java @@ -64,7 +64,7 @@ */ public class dB { - public static boolean showDebug = Settings.ShowDebug(); + public static boolean showDebug = Settings.showDebug(); public static boolean showStackTraces = true; public static boolean showScriptBuilder = false; public static boolean showColor = true; @@ -418,7 +418,7 @@ public static void sendMessage(String string) { // These colors are used a lot in the debugging of commands/etc, so having a few shortcuts is nicer // than having a bunch of ChatColor.XXXX - string = TagManager.CleanOutputFully(string + string = TagManager.cleanOutputFully(string .replace("", ChatColor.YELLOW.toString()) .replace("", ChatColor.DARK_GRAY.toString()) .replace("", ChatColor.AQUA.toString())); @@ -433,9 +433,10 @@ public static void sendMessage(String string) { String[] words = string.split(" "); StringBuilder buffer = new StringBuilder(); int length = 0; + int width = Settings.consoleWidth(); for (String word : words) { // # of total chars * # of lines - timestamp int strippedLength = ChatColor.stripColor(word).length() + 1; - if (length + strippedLength < Settings.ConsoleWidth()) { + if (length + strippedLength < width) { buffer.append(word).append(" "); length = length + strippedLength; } else { @@ -443,7 +444,7 @@ public static void sendMessage(String string) { length = strippedLength; // Leave spaces to account for timestamp and indent buffer.append("\n ").append(word).append(" "); - } // 16:05:06 [INFO] + } // [01:02:03 INFO]: } String result = buffer.toString();