Fix code formatting a little

DenizenScript · Jan 27, 2016 · 188f2ca · 188f2ca
1 parent 7591e03
commit 188f2ca
Show file tree

Hide file tree

Showing 32 changed files with 400 additions and 216 deletions.
diff --git a/src/main/java/net/gnomeffinway/depenizen/Depenizen.java b/src/main/java/net/gnomeffinway/depenizen/Depenizen.java
@@ -36,7 +36,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
         if (cmd.getName().equalsIgnoreCase("depenizen")) {
             sender.sendMessage(ChatColor.UNDERLINE + "Depenizen");
             sender.sendMessage(ChatColor.GRAY + "Developers: " + ChatColor.AQUA + "Morphan1" + ChatColor.GRAY + ", " + ChatColor.GREEN + "Jeebiss" + ChatColor.GRAY + ", and GnomeffinWay");
-            sender.sendMessage(ChatColor.GRAY + "Current version: "+ ChatColor.GOLD + this.getDescription().getVersion());
+            sender.sendMessage(ChatColor.GRAY + "Current version: " + ChatColor.GOLD + this.getDescription().getVersion());
             return true;
         }
         return false;
@@ -53,7 +53,8 @@ public void checkPlugins() {
 
         if (pm.getPlugin("Denizen") != null) {
             depenizenLog("Denizen hooked");
-        } else {
+        }
+        else {
             getServer().getLogger().severe("[Depenizen] Denizen not found, disabling");
             getPluginLoader().disablePlugin(this);
             return;

diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/BattleNightCommands.java b/src/main/java/net/gnomeffinway/depenizen/commands/BattleNightCommands.java
@@ -85,8 +85,9 @@ else if (!scriptEntry.hasObject("spectator")
         }
 
         // Stash objects in scriptEntry for use in execute()
-        if (!scriptEntry.hasObject("action"))
+        if (!scriptEntry.hasObject("action")) {
             throw new InvalidArgumentsException("Must specify an action!");
+        }
 
         // scriptEntry.defaultObject("spectator", Element.FALSE);
     }

diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/JobsCommands.java b/src/main/java/net/gnomeffinway/depenizen/commands/JobsCommands.java
@@ -44,7 +44,7 @@ public class JobsCommands extends AbstractCommand {
 
     // -->
 
-    private enum Action { PROMOTE, DEMOTE, JOIN, QUIT }
+    private enum Action {PROMOTE, DEMOTE, JOIN, QUIT}
 
     public JobsCommands() {
 
@@ -73,10 +73,12 @@ else if (!scriptEntry.hasObject("number")
 
         }
 
-        if (!scriptEntry.hasObject("action"))
+        if (!scriptEntry.hasObject("action")) {
             throw new InvalidArgumentsException("Must specify an action!");
-        if (!scriptEntry.hasObject("job"))
+        }
+        if (!scriptEntry.hasObject("job")) {
             throw new InvalidArgumentsException("Must specify a job!");
+        }
 
     }
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/TownyCommands.java b/src/main/java/net/gnomeffinway/depenizen/commands/TownyCommands.java
@@ -37,42 +37,51 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
         for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) {
 
             if (!scriptEntry.hasObject("action")
-                    && arg.matchesEnum(Action.values()))
+                    && arg.matchesEnum(Action.values())) {
                 scriptEntry.addObject("action", arg.asElement());
+            }
 
             else if (!scriptEntry.hasObject("state")
                     && arg.matchesPrefix("s", "state")
-                    && arg.matchesEnum(State.values()))
+                    && arg.matchesEnum(State.values())) {
                 scriptEntry.addObject("state", arg.asElement());
+            }
 
             else if (!scriptEntry.hasObject("town")
-                    && arg.matchesArgumentType(dTown.class))
+                    && arg.matchesArgumentType(dTown.class)) {
                 scriptEntry.addObject("town", arg.asType(dTown.class));
+            }
 
             else if (!scriptEntry.hasObject("nation")
-                    && arg.matchesArgumentType(dNation.class))
+                    && arg.matchesArgumentType(dNation.class)) {
                 scriptEntry.addObject("nation", arg.asType(dNation.class));
+            }
 
             else if (!scriptEntry.hasObject("location")
-                    && arg.matchesArgumentType(dLocation.class))
+                    && arg.matchesArgumentType(dLocation.class)) {
                 scriptEntry.addObject("location", arg.asType(dLocation.class));
+            }
 
             else if (!scriptEntry.hasObject("qty")
                     && arg.matchesPrefix("qty", "q", "quantity")
-                    && arg.matchesPrimitive(aH.PrimitiveType.Double))
+                    && arg.matchesPrimitive(aH.PrimitiveType.Double)) {
                 scriptEntry.addObject("qty", arg.asElement());
+            }
 
             else if (!scriptEntry.hasObject("type")
-                    && arg.matchesEnum(Type.values()))
+                    && arg.matchesEnum(Type.values())) {
                 scriptEntry.addObject("type", arg.asElement());
+            }
 
         }
 
-        if (!scriptEntry.hasObject("action"))
+        if (!scriptEntry.hasObject("action")) {
             throw new InvalidArgumentsException("Must specify a valid action!");
+        }
 
-        if (!scriptEntry.hasObject("type"))
+        if (!scriptEntry.hasObject("type")) {
             throw new InvalidArgumentsException("Must specify a valid type!");
+        }
 
         scriptEntry.defaultObject("town", new Element("")).defaultObject("nation", "")
                 .defaultObject("state", new Element("TOGGLE"));
@@ -91,7 +100,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
         dLocation location = scriptEntry.getdObject("location");
 
         dB.report(scriptEntry, getName(), action.debug() + type.debug() + state.debug() + town.debug() + nation.debug()
-                + (qty != null ? qty.debug() : "") + (location != null ? location.debug() :""));
+                + (qty != null ? qty.debug() : "") + (location != null ? location.debug() : ""));
 
         switch (Type.valueOf(type.asString().toUpperCase())) {
             case RESIDENT:

diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/bungee/BungeeCommand.java b/src/main/java/net/gnomeffinway/depenizen/commands/bungee/BungeeCommand.java
@@ -80,11 +80,13 @@ else if (arg.matches("{")) {
 
         }
 
-        if (!scriptEntry.hasObject("servers") && !scriptEntry.hasObject("all-servers"))
+        if (!scriptEntry.hasObject("servers") && !scriptEntry.hasObject("all-servers")) {
             throw new InvalidArgumentsException("Must specify valid server(s)!");
+        }
 
-        if (!scriptEntry.hasObject("braces"))
+        if (!scriptEntry.hasObject("braces")) {
             throw new InvalidArgumentsException("Must have braces!");
+        }
 
         scriptEntry.defaultObject("all-servers", new Element(false));
     }

diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/bungee/BungeeTagCommand.java b/src/main/java/net/gnomeffinway/depenizen/commands/bungee/BungeeTagCommand.java
@@ -50,7 +50,7 @@ public class BungeeTagCommand extends AbstractCommand implements Holdable {
 
     // -->
 
-    public BungeeTagCommand(){
+    public BungeeTagCommand() {
         setParseArgs(false);
     }
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/EssentialsEvents.java b/src/main/java/net/gnomeffinway/depenizen/events/EssentialsEvents.java
@@ -42,18 +42,21 @@ public class EssentialsEvents implements Listener {
     public void afkStatusChange(AfkStatusChangeEvent event) {
 
         List<String> events = new ArrayList<String>();
-        if (event.getValue())
+        if (event.getValue()) {
             events.add("player goes afk");
-        else
+        }
+        else {
             events.add("player returns from afk");
+        }
 
         List<String> determinations = OldEventManager.doEvents(events,
                 new BukkitScriptEntryData(dPlayer.mirrorBukkitPlayer(event.getAffected().getBase()), null), null);
 
         for (String determination : determinations) {
             determination = determination.toUpperCase();
-            if (determination.equals("CANCELLED"))
+            if (determination.equals("CANCELLED")) {
                 event.setCancelled(true);
+            }
         }
 
     }
@@ -82,22 +85,26 @@ public void afkStatusChange(AfkStatusChangeEvent event) {
     public void godStatusChange(GodStatusChangeEvent event) {
 
         Map<String, dObject> context = new HashMap<String, dObject>();
-        if (event.getController() != null)
+        if (event.getController() != null) {
             context.put("controller", dPlayer.mirrorBukkitPlayer(event.getController().getBase()));
+        }
 
         List<String> events = new ArrayList<String>();
-        if (event.getValue())
+        if (event.getValue()) {
             events.add("player god mode enabled");
-        else
+        }
+        else {
             events.add("player god mode disabled");
+        }
 
         List<String> determinations = OldEventManager.doEvents(events,
                 new BukkitScriptEntryData(dPlayer.mirrorBukkitPlayer(event.getAffected().getBase()), null), context);
 
         for (String determination : determinations) {
             determination = determination.toUpperCase();
-            if (determination.equals("CANCELLED"))
+            if (determination.equals("CANCELLED")) {
                 event.setCancelled(true);
+            }
         }
     }
 
@@ -125,22 +132,26 @@ public void godStatusChange(GodStatusChangeEvent event) {
     public void jailStatusChange(JailStatusChangeEvent event) {
 
         Map<String, dObject> context = new HashMap<String, dObject>();
-        if (event.getController() != null)
+        if (event.getController() != null) {
             context.put("controller", dPlayer.mirrorBukkitPlayer(event.getController().getBase()));
+        }
 
         List<String> events = new ArrayList<String>();
-        if (event.getValue())
+        if (event.getValue()) {
             events.add("player jailed");
-        else
+        }
+        else {
             events.add("player unjailed");
+        }
 
         List<String> determinations = OldEventManager.doEvents(events,
                 new BukkitScriptEntryData(dPlayer.mirrorBukkitPlayer(event.getAffected().getBase()), null), context);
 
         for (String determination : determinations) {
             determination = determination.toUpperCase();
-            if (determination.equals("CANCELLED"))
+            if (determination.equals("CANCELLED")) {
                 event.setCancelled(true);
+            }
         }
     }
 
@@ -168,22 +179,26 @@ public void jailStatusChange(JailStatusChangeEvent event) {
     public void muteStatusChange(MuteStatusChangeEvent event) {
 
         Map<String, dObject> context = new HashMap<String, dObject>();
-        if (event.getController() != null)
+        if (event.getController() != null) {
             context.put("controller", dPlayer.mirrorBukkitPlayer(event.getController().getBase()));
+        }
 
         List<String> events = new ArrayList<String>();
-        if (event.getValue())
+        if (event.getValue()) {
             events.add("player muted");
-        else
+        }
+        else {
             events.add("player unmuted");
+        }
 
         List<String> determinations = OldEventManager.doEvents(events,
                 new BukkitScriptEntryData(dPlayer.mirrorBukkitPlayer(event.getAffected().getBase()), null), context);
 
         for (String determination : determinations) {
             determination = determination.toUpperCase();
-            if (determination.equals("CANCELLED"))
+            if (determination.equals("CANCELLED")) {
                 event.setCancelled(true);
+            }
         }
     }
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/HeroesEvents.java b/src/main/java/net/gnomeffinway/depenizen/events/HeroesEvents.java
@@ -47,10 +47,12 @@ public void changeClass(ClassChangeEvent event) {
         context.put("from", new HeroesClass(event.getFrom()));
         context.put("hero", hero);
 
-        if (hero.isNPC())
+        if (hero.isNPC()) {
             npc = (dNPC) hero.getDenizenObject();
-        else if (hero.isPlayer())
+        }
+        else if (hero.isPlayer()) {
             player = (dPlayer) hero.getDenizenObject();
+        }
 
         List<String> determinations = OldEventManager.doEvents(Arrays.asList
                         ("hero changes class",
@@ -59,8 +61,9 @@ else if (hero.isPlayer())
 
         for (String determination : determinations) {
             determination = determination.toUpperCase();
-            if (determination.equals("CANCELLED"))
+            if (determination.equals("CANCELLED")) {
                 event.setCancelled(true);
+            }
         }
     }
 
@@ -90,18 +93,21 @@ public void changeExperience(ExperienceChangeEvent event) {
         context.put("hero", hero);
         context.put("reason", new Element(event.getSource().name()));
 
-        if (hero.isNPC())
+        if (hero.isNPC()) {
             npc = (dNPC) hero.getDenizenObject();
-        else if (hero.isPlayer())
+        }
+        else if (hero.isPlayer()) {
             player = (dPlayer) hero.getDenizenObject();
+        }
 
         List<String> determinations = OldEventManager.doEvents(Arrays.asList("hero changes experience"),
                 new BukkitScriptEntryData(player, npc), context);
 
         for (String determination : determinations) {
             determination = determination.toUpperCase();
-            if (determination.equals("CANCELLED"))
+            if (determination.equals("CANCELLED")) {
                 event.setCancelled(true);
+            }
         }
     }
 
@@ -131,10 +137,12 @@ public void changeLevel(HeroChangeLevelEvent event) {
         context.put("hero", hero);
         context.put("level", new Element(event.getTo()));
 
-        if (hero.isNPC())
+        if (hero.isNPC()) {
             npc = (dNPC) hero.getDenizenObject();
-        else if (hero.isPlayer())
+        }
+        else if (hero.isPlayer()) {
             player = (dPlayer) hero.getDenizenObject();
+        }
 
         List<String> determinations = OldEventManager.doEvents(Arrays.asList
                         ("hero changes level",

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/PVPArenaEvents.java b/src/main/java/net/gnomeffinway/depenizen/events/PVPArenaEvents.java
@@ -37,8 +37,9 @@ public void onArenaStarts(PAStartEvent event) {
         context.put("arena", new Element(arena.getName()));
 
         ArrayList<dPlayer> fighters = new ArrayList<dPlayer>();
-        for (ArenaPlayer player : event.getArena().getFighters())
+        for (ArenaPlayer player : event.getArena().getFighters()) {
             fighters.add(new dPlayer(player.get()));
+        }
 
         context.put("fighters", new dList(fighters));
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/SkillAPIEvents.java b/src/main/java/net/gnomeffinway/depenizen/events/SkillAPIEvents.java
@@ -63,16 +63,17 @@ public void onSkillUpgrade(PlayerSkillUpgradeEvent event) {
         context.put("skill_name", new Element(skill));
 
         List<String> determinations = OldEventManager.doEvents(Arrays.asList(
-                        "player upgrades skill in skillapi",
-                        "player upgrades " + skill + " in skillapi"),
+                "player upgrades skill in skillapi",
+                "player upgrades " + skill + " in skillapi"),
                 // NOTE: This code previously handled offline players, but SkillAPI no longer does?
                 new BukkitScriptEntryData(dPlayer.mirrorBukkitPlayer(event.getPlayerData().getPlayer()), null),
                 context);
 
         for (String determination : determinations) {
             determination = determination.toUpperCase();
-            if (determination.startsWith("CANCELLED"))
+            if (determination.startsWith("CANCELLED")) {
                 event.setCancelled(true);
+            }
         }
     }
 
@@ -95,8 +96,8 @@ public void onSkillDowngrade(PlayerSkillDowngradeEvent event) {
         context.put("skill_name", new Element(skill));
 
         OldEventManager.doEvents(Arrays.asList(
-                        "player downgrades skill in skillapi",
-                        "player downgrades " + skill + " in skillapi"),
+                "player downgrades skill in skillapi",
+                "player downgrades " + skill + " in skillapi"),
                 // NOTE: This code previously handled offline players, but SkillAPI no longer does?
                 new BukkitScriptEntryData(dPlayer.mirrorBukkitPlayer(event.getPlayerData().getPlayer()), null),
                 context);
@@ -121,8 +122,8 @@ public void onSkillUnlock(PlayerSkillUnlockEvent event) {
         context.put("skill_name", new Element(skill));
 
         OldEventManager.doEvents(Arrays.asList(
-                        "player unlocks skill in skillapi",
-                        "player unlocks " + skill + " in skillapi"),
+                "player unlocks skill in skillapi",
+                "player unlocks " + skill + " in skillapi"),
                 // NOTE: This code previously handled offline players, but SkillAPI no longer does?
                 new BukkitScriptEntryData(dPlayer.mirrorBukkitPlayer(event.getPlayerData().getPlayer()), null),
                 context);