Minor Cleanup of MythicMobs Support.

IntelliJ Reformat ❤️
DenizenScript · Feb 6, 2016 · ab82108 · ab82108
1 parent f56660c
commit ab82108
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 48 deletions.
diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/BattleNightCommands.java b/src/main/java/net/gnomeffinway/depenizen/commands/BattleNightCommands.java
@@ -2,10 +2,10 @@
 
 import me.limebyte.battlenight.core.BattleNight;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
-import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
+import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;

diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/McMMOCommands.java b/src/main/java/net/gnomeffinway/depenizen/commands/McMMOCommands.java
@@ -8,14 +8,14 @@
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.party.PartyManager;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
+import net.aufdemrand.denizen.objects.dPlayer;
+import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;
-import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
-import net.aufdemrand.denizen.utilities.debugging.dB;
 
 public class McMMOCommands extends AbstractCommand {
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/TownyCommands.java b/src/main/java/net/gnomeffinway/depenizen/commands/TownyCommands.java
@@ -1,11 +1,11 @@
 package net.gnomeffinway.depenizen.commands;
 
+import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;
-import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import net.gnomeffinway.depenizen.objects.dNation;

diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/bungee/BungeeCommand.java b/src/main/java/net/gnomeffinway/depenizen/commands/bungee/BungeeCommand.java
@@ -12,7 +12,6 @@
 import net.gnomeffinway.depenizen.support.bungee.BungeeSupport;
 import net.gnomeffinway.depenizen.support.bungee.packets.ClientPacketOutScript;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/heroes/HeroesXPCommand.java b/src/main/java/net/gnomeffinway/depenizen/commands/heroes/HeroesXPCommand.java
@@ -12,7 +12,6 @@
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import net.aufdemrand.denizencore.utilities.debugging.dB;
 import net.gnomeffinway.depenizen.objects.heroes.HeroesClass;
-import net.gnomeffinway.depenizen.objects.heroes.HeroesHero;
 import net.gnomeffinway.depenizen.support.Support;
 import net.gnomeffinway.depenizen.support.plugins.HeroesSupport;
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/worldguard/RegionCommand.java b/src/main/java/net/gnomeffinway/depenizen/commands/worldguard/RegionCommand.java
@@ -5,15 +5,14 @@
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
 import net.aufdemrand.denizen.objects.dCuboid;
 import net.aufdemrand.denizen.objects.dWorld;
+import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
-import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import net.gnomeffinway.depenizen.support.Support;
-import net.gnomeffinway.depenizen.support.Supported;
 import net.gnomeffinway.depenizen.support.plugins.WorldGuardSupport;
 import org.bukkit.Location;
 import org.bukkit.World;

diff --git a/.../gnomeffinway/depenizen/events/ASkyBlock/PlayerCompletesSkyBlockChallengeScriptEvent.java b/.../gnomeffinway/depenizen/events/ASkyBlock/PlayerCompletesSkyBlockChallengeScriptEvent.java
@@ -3,7 +3,6 @@
 import com.wasteofplastic.askyblock.events.ChallengeCompleteEvent;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;
-import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dItem;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;

diff --git a/...ain/java/net/gnomeffinway/depenizen/events/ASkyBlock/PlayerEntersSkyBlockScriptEvent.java b/...ain/java/net/gnomeffinway/depenizen/events/ASkyBlock/PlayerEntersSkyBlockScriptEvent.java
@@ -3,7 +3,6 @@
 import com.wasteofplastic.askyblock.events.IslandEnterEvent;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;
-import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;

diff --git a/...main/java/net/gnomeffinway/depenizen/events/ASkyBlock/PlayerExitsSkyBlockScriptEvent.java b/...main/java/net/gnomeffinway/depenizen/events/ASkyBlock/PlayerExitsSkyBlockScriptEvent.java
@@ -1,10 +1,8 @@
 package net.gnomeffinway.depenizen.events.ASkyBlock;
 
-import com.wasteofplastic.askyblock.events.IslandEnterEvent;
 import com.wasteofplastic.askyblock.events.IslandExitEvent;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;
-import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/ASkyBlock/SkyBlockCreatedScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/ASkyBlock/SkyBlockCreatedScriptEvent.java
@@ -3,7 +3,6 @@
 import com.wasteofplastic.askyblock.events.IslandNewEvent;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;
-import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/ASkyBlock/SkyBlockResetScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/ASkyBlock/SkyBlockResetScriptEvent.java
@@ -3,7 +3,6 @@
 import com.wasteofplastic.askyblock.events.IslandResetEvent;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;
-import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mcMMO/mcMMOPlayerGainsXPScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mcMMO/mcMMOPlayerGainsXPScriptEvent.java
@@ -1,6 +1,5 @@
 package net.gnomeffinway.depenizen.events.mcMMO;
 
-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;
@@ -17,8 +16,6 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
-import java.util.List;
-
 // <--[event]
 // @Events
 // mcmmo player gains xp for skill (in <area>)

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mcMMO/mcMMOPlayerLevelChangeScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mcMMO/mcMMOPlayerLevelChangeScriptEvent.java
@@ -1,6 +1,5 @@
 package net.gnomeffinway.depenizen.events.mcMMO;
 
-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.events.experience.McMMOPlayerLevelChangeEvent;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mcMMO/mcMMOPlayerLevelDownScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mcMMO/mcMMOPlayerLevelDownScriptEvent.java
@@ -1,6 +1,5 @@
 package net.gnomeffinway.depenizen.events.mcMMO;
 
-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.events.experience.McMMOPlayerLevelDownEvent;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mcMMO/mcMMOPlayerLevelUpScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mcMMO/mcMMOPlayerLevelUpScriptEvent.java
@@ -1,6 +1,5 @@
 package net.gnomeffinway.depenizen.events.mcMMO;
 
-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;

diff --git a/src/main/java/net/gnomeffinway/depenizen/extensions/towny/TownyChatPlayerExtension.java b/src/main/java/net/gnomeffinway/depenizen/extensions/towny/TownyChatPlayerExtension.java
@@ -3,15 +3,12 @@
 import com.palmergames.bukkit.TownyChat.Chat;
 import com.palmergames.bukkit.TownyChat.channels.Channel;
 import com.palmergames.bukkit.TownyChat.channels.ChannelsHolder;
-import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
-import com.palmergames.bukkit.towny.object.Resident;
 import com.palmergames.bukkit.towny.object.TownyUniverse;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.dList;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.tags.Attribute;
-import net.aufdemrand.denizencore.utilities.debugging.dB;
 import net.gnomeffinway.depenizen.extensions.dObjectExtension;
 import net.gnomeffinway.depenizen.support.Support;
 import net.gnomeffinway.depenizen.support.plugins.TownyChatSupport;

diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/MythicMobs/MythicMobsMob.java b/src/main/java/net/gnomeffinway/depenizen/objects/MythicMobs/MythicMobsMob.java
@@ -26,19 +26,18 @@ public static MythicMobsMob valueOf(String string, TagContext context) {
         if (string == null) {
             return null;
         }
-        string = string.replace("e@", "").replace("mythicmob@", "");
-        UUID uuid;
         try {
-            uuid = UUID.fromString(string);
+            string = string.replace("e@", "").replace("mythicmob@", "");
+            UUID uuid = UUID.fromString(string);
+            IMobsAPI api = MythicMobs.inst().getAPI().getMobAPI();
+            if (!api.isMythicMob(uuid)) {
+                return null;
+            }
+            return new MythicMobsMob(api.getMythicMobInstance(dEntity.getEntityForID(uuid)));
         }
         catch (Exception e) {
             return null;
         }
-        IMobsAPI api = MythicMobs.inst().getAPI().getMobAPI();
-        if (!api.isMythicMob(uuid)) {
-            return null;
-        }
-        return new MythicMobsMob(api.getMythicMobInstance(dEntity.getEntityForID(uuid)));
     }
 
     public static boolean matches(String string) {
@@ -66,7 +65,7 @@ public Entity getEntity() {
         return mob.getEntity().getBukkitEntity();
     }
 
-    String prefix;
+    private String prefix;
     ActiveMob mob;
 
     @Override

diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/dNation.java b/src/main/java/net/gnomeffinway/depenizen/objects/dNation.java
@@ -4,12 +4,12 @@
 import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
 import com.palmergames.bukkit.towny.object.Nation;
 import com.palmergames.bukkit.towny.object.TownyUniverse;
+import net.aufdemrand.denizen.objects.dPlayer;
+import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.Fetchable;
 import net.aufdemrand.denizencore.objects.dObject;
-import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizencore.tags.Attribute;
-import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.tags.TagContext;
 
 public class dNation implements dObject {

diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/heroes/HeroesHero.java b/src/main/java/net/gnomeffinway/depenizen/objects/heroes/HeroesHero.java
@@ -2,7 +2,6 @@
 
 import com.herocraftonline.heroes.Heroes;
 import com.herocraftonline.heroes.characters.Hero;
-import com.herocraftonline.heroes.characters.party.HeroParty;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dNPC;
 import net.aufdemrand.denizen.objects.dPlayer;

diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/prism/PrismAction.java b/src/main/java/net/gnomeffinway/depenizen/objects/prism/PrismAction.java
@@ -11,7 +11,6 @@
 import net.aufdemrand.denizencore.utilities.debugging.dB;
 import net.gnomeffinway.depenizen.objects.prism.fake.FakeHandler;
 import net.gnomeffinway.depenizen.support.Support;
-import net.gnomeffinway.depenizen.support.Supported;
 import net.gnomeffinway.depenizen.support.plugins.PrismSupport;
 
 import java.util.regex.Matcher;

diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/prism/properties/PrismActionBlock.java b/src/main/java/net/gnomeffinway/depenizen/objects/prism/properties/PrismActionBlock.java
@@ -1,9 +1,9 @@
 package net.gnomeffinway.depenizen.objects.prism.properties;
 
 import me.botsko.prism.actions.Handler;
+import net.aufdemrand.denizen.objects.dMaterial;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.Mechanism;
-import net.aufdemrand.denizen.objects.dMaterial;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.objects.properties.Property;
 import net.aufdemrand.denizencore.tags.Attribute;

diff --git a/src/main/java/net/gnomeffinway/depenizen/support/Support.java b/src/main/java/net/gnomeffinway/depenizen/support/Support.java
@@ -7,7 +7,10 @@
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class Support {
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/support/SupportManager.java b/src/main/java/net/gnomeffinway/depenizen/support/SupportManager.java
@@ -1,6 +1,9 @@
 package net.gnomeffinway.depenizen.support;
 
 import net.aufdemrand.denizen.objects.dNPC;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
+import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizen.utilities.depends.Depends;
 import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
 import net.aufdemrand.denizencore.objects.dObject;
@@ -9,9 +12,6 @@
 import net.aufdemrand.denizencore.tags.Attribute;
 import net.aufdemrand.denizencore.tags.ReplaceableTagEvent;
 import net.aufdemrand.denizencore.tags.TagManager;
-import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizen.utilities.depends.Depends;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import net.gnomeffinway.depenizen.Depenizen;
 import org.bukkit.event.Listener;

diff --git a/src/main/java/net/gnomeffinway/depenizen/support/Supported.java b/src/main/java/net/gnomeffinway/depenizen/support/Supported.java
@@ -7,8 +7,12 @@
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 
-import java.net.*;
-import java.util.*;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/support/bungee/BungeeSupport.java b/src/main/java/net/gnomeffinway/depenizen/support/bungee/BungeeSupport.java
@@ -9,9 +9,9 @@
 import net.gnomeffinway.depenizen.Settings;
 import net.gnomeffinway.depenizen.commands.bungee.BungeeCommand;
 import net.gnomeffinway.depenizen.commands.bungee.BungeeTagCommand;
-import net.gnomeffinway.depenizen.events.bungee.ProxyPingScriptEvent;
-import net.gnomeffinway.depenizen.events.bungee.PostLoginScriptEvent;
 import net.gnomeffinway.depenizen.events.bungee.PlayerDisconnectScriptEvent;
+import net.gnomeffinway.depenizen.events.bungee.PostLoginScriptEvent;
+import net.gnomeffinway.depenizen.events.bungee.ProxyPingScriptEvent;
 import net.gnomeffinway.depenizen.events.bungee.ServerSwitchScriptEvent;
 import net.gnomeffinway.depenizen.extensions.bungee.BungeePlayerExtension;
 import net.gnomeffinway.depenizen.objects.bungee.dServer;

diff --git a/...java/net/gnomeffinway/depenizen/support/bungee/packets/ClientPacketOutEventSubscribe.java b/...java/net/gnomeffinway/depenizen/support/bungee/packets/ClientPacketOutEventSubscribe.java
@@ -1,7 +1,5 @@
 package net.gnomeffinway.depenizen.support.bungee.packets;
 
-import java.util.List;
-
 public class ClientPacketOutEventSubscribe extends Packet {
 
     public static enum Action {