Remove NMS imports.

Change fancy log header.
cnaude · Dec 23, 2014 · 58d996f · 58d996f
1 parent aaba17d
commit 58d996f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/Commands/UpdateCheck.java b/src/main/java/com/cnaude/purpleirc/Commands/UpdateCheck.java
@@ -50,7 +50,7 @@ public void dispatch(CommandSender sender, String[] args) {
         if (args.length >= 2) {
             String mode = args[1];
             plugin.updateChecker.asyncUpdateCheck(sender, mode);
-        } else {
+        } else { 
             plugin.updateChecker.asyncUpdateCheck(sender, plugin.updateCheckerMode());
         }
 

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -212,8 +212,7 @@ public PurpleIRC() {
     @Override
     public void onEnable() {
         LOG_HEADER = "[" + this.getName() + "]";
-        LOG_HEADER_F = ChatColor.DARK_PURPLE + "[" + this.getName() + "]"
-                + ChatColor.WHITE;
+        LOG_HEADER_F = ChatColor.DARK_PURPLE + "[" + this.getName() + "]" + ChatColor.RESET;
         pluginFolder = getDataFolder();
         botsFolder = new File(pluginFolder + "/bots");
         configFile = new File(pluginFolder, "config.yml");
@@ -425,7 +424,7 @@ public void onDisable() {
         } else {
             logInfo("Disconnecting IRC bots.");
             for (PurpleBot ircBot : ircBots.values()) {
-                commandQueue.cancel();                
+                commandQueue.cancel();
                 ircBot.saveConfig(getServer().getConsoleSender());
                 ircBot.quit();
             }
@@ -777,7 +776,7 @@ public void reloadMainConfig(CommandSender sender) {
         reloadConfig();
         getConfig().options().copyDefaults(false);
         loadConfig();
-        sender.sendMessage(LOG_HEADER_F + ChatColor.WHITE + " Done.");
+        sender.sendMessage(LOG_HEADER_F + ChatColor.RESET + " Done.");
     }
 
     private void createConfigDirs() {
@@ -1417,11 +1416,11 @@ public String botify(String bot) {
             return bot + ".yml";
         }
     }
-    
+
     public boolean isUpdateCheckerEnabled() {
         return updateCheckerEnabled;
     }
-    
+
     public String updateCheckerMode() {
         return updateCheckerMode;
     }

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -34,11 +34,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.UUID;
-import net.minecraft.server.v1_8_R1.EntityPlayer;
-import net.minecraft.server.v1_8_R1.EnumPlayerInfoAction;
-import net.minecraft.server.v1_8_R1.MinecraftServer;
-import net.minecraft.server.v1_8_R1.PacketPlayOutPlayerInfo;
-import net.minecraft.server.v1_8_R1.PlayerInteractManager;
 import org.bukkit.entity.Player;
 import org.pircbotx.Channel;
 import org.pircbotx.User;
@@ -147,16 +142,15 @@ private PacketContainer tabPacket(String name, boolean add) {
                     packet.getPlayerInfoDataLists().write(0, Arrays.asList(pid));
                 } else {
                     plugin.logDebug("T: Removing: " + name);
-                    EntityPlayer pl = new EntityPlayer(   
-                            MinecraftServer.getServer(),
-                            MinecraftServer.getServer().getWorldServer(0),
-                            (GameProfile)(new WrappedGameProfile(uuid, displayName)).getHandle(),
-                            new PlayerInteractManager(MinecraftServer.getServer().getWorldServer(0))
-
+                    net.minecraft.server.v1_8_R1.EntityPlayer pl = new net.minecraft.server.v1_8_R1.EntityPlayer(
+                            net.minecraft.server.v1_8_R1.MinecraftServer.getServer(),
+                            net.minecraft.server.v1_8_R1.MinecraftServer.getServer().getWorldServer(0),
+                            (GameProfile) (new WrappedGameProfile(uuid, displayName)).getHandle(),
+                            new net.minecraft.server.v1_8_R1.PlayerInteractManager(net.minecraft.server.v1_8_R1.MinecraftServer.getServer().getWorldServer(0))
                     );
-                    PacketPlayOutPlayerInfo pi = new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, pl);
+                    net.minecraft.server.v1_8_R1.PacketPlayOutPlayerInfo pi = new net.minecraft.server.v1_8_R1.PacketPlayOutPlayerInfo(net.minecraft.server.v1_8_R1.EnumPlayerInfoAction.REMOVE_PLAYER, pl);
                     return PacketContainer.fromPacket(pi);
-                    
+
                 }
                 return packet;
             } catch (Exception ex) {