Cleaned up CraftBukkit comments in NMS.

Added newlines at the end of files
Fixed improper line endings on some files
Matched start - end comments
Added some missing comments for diffs
Fixed syntax on some spots
Minimized some diff
Removed some no longer used files
Added comment on some required files with no changes
Fixed imports of items used once
Added imports for items used more than once

1 files changed, 14 insertions, 24 deletions

diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e6c7ec13..c58551ee 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1,5 +1,6 @@
 package net.minecraft.server;
 
+// import java.awt.GraphicsEnvironment; // CraftBukkit
 import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
@@ -14,25 +15,14 @@ import java.util.logging.Logger;
 
 // CraftBukkit start
 import java.io.PrintStream;
-import java.net.UnknownHostException;
 import jline.console.ConsoleReader;
 import joptsimple.OptionSet;
+
 import org.bukkit.World.Environment;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.command.RemoteConsoleCommandSender;
-import org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender;
-import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.LoggerOutputStream;
-import org.bukkit.craftbukkit.scheduler.CraftScheduler;
-import org.bukkit.craftbukkit.util.ServerShutdownThread;
 import org.bukkit.event.server.ServerCommandEvent;
 import org.bukkit.event.server.RemoteServerCommandEvent;
-import org.bukkit.event.world.WorldInitEvent;
-import org.bukkit.event.world.WorldLoadEvent;
 import org.bukkit.event.world.WorldSaveEvent;
-import org.bukkit.generator.ChunkGenerator;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginLoadOrder;
 // CraftBukkit end
 
 public class MinecraftServer implements Runnable, ICommandListener, IMinecraftServer {
@@ -76,10 +66,10 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
 
     // CraftBukkit start
     public List<WorldServer> worlds = new ArrayList<WorldServer>();
-    public CraftServer server;
+    public org.bukkit.craftbukkit.CraftServer server;
     public OptionSet options;
-    public ConsoleCommandSender console;
-    public RemoteConsoleCommandSender remoteConsole;
+    public org.bukkit.command.ConsoleCommandSender console;
+    public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
     public ConsoleReader reader;
     public static int currentTick;
     public final Thread primaryThread;
@@ -105,13 +95,13 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
                 Logger.getLogger(MinecraftServer.class.getName()).log(Level.SEVERE, null, ex);
             }
         }
-        Runtime.getRuntime().addShutdownHook(new ServerShutdownThread(this));
+        Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
 
         primaryThread = new ThreadServerApplication("Server thread", this); // Moved from main
         // CraftBukkit end
     }
 
-    private boolean init() throws UnknownHostException { // CraftBukkit - added throws UnknownHostException
+    private boolean init() throws java.net.UnknownHostException { // CraftBukkit - added throws UnknownHostException
         this.consoleCommandHandler = new ConsoleCommandHandler(this);
         ThreadCommandReader threadcommandreader = new ThreadCommandReader(this);
 
@@ -211,7 +201,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
             log.info("Starting remote control listener");
             this.J = new RemoteControlListener(this);
             this.J.a();
-            this.remoteConsole = new CraftRemoteConsoleCommandSender();
+            this.remoteConsole = new org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender(); // CraftBukkit
         }
 
         // CraftBukkit start
@@ -265,7 +255,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
             String worldType = Environment.getEnvironment(dimension).toString().toLowerCase();
             String name = (dimension == 0) ? s : s + "_" + worldType;
 
-            ChunkGenerator gen = this.server.getGenerator(name);
+            org.bukkit.generator.ChunkGenerator gen = this.server.getGenerator(name);
             WorldSettings settings = new WorldSettings(i, j, generateStructures, false, worldtype);
 
             if (k == 0) {
@@ -311,7 +301,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
                 world.getWorld().getPopulators().addAll(gen.getDefaultPopulators(world.getWorld()));
             }
 
-            this.server.getPluginManager().callEvent(new WorldInitEvent(world.getWorld()));
+            this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldInitEvent(world.getWorld()));
 
             world.tracker = new EntityTracker(this, world); // CraftBukkit
             world.addIWorldAccess(new WorldManager(this, world));
@@ -363,7 +353,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
 
         // CraftBukkit start
         for (World world : this.worlds) {
-            this.server.getPluginManager().callEvent(new WorldLoadEvent(world.getWorld()));
+            this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(world.getWorld()));
         }
         // CraftBukkit end
 
@@ -380,7 +370,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
         this.k = null;
         this.l = 0;
 
-        this.server.enablePlugins(PluginLoadOrder.POSTWORLD); // CraftBukkit
+        this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD); // CraftBukkit
     }
 
     void saveChunks() { // CraftBukkit - private -> default
@@ -532,7 +522,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
 
         // CraftBukkit start - only send timeupdates to the people in that world
 
-        ((CraftScheduler) this.server.getScheduler()).mainThreadHeartbeat(this.ticks);
+        ((org.bukkit.craftbukkit.scheduler.CraftScheduler) this.server.getScheduler()).mainThreadHeartbeat(this.ticks);
 
         // Send timeupdates to everyone, it will get the right time from the world the player is in.
         if (this.ticks % 20 == 0) {
@@ -722,7 +712,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
     public String getPlugins() {
         // CraftBukkit start - whole method
         StringBuilder result = new StringBuilder();
-        Plugin[] plugins = server.getPluginManager().getPlugins();
+        org.bukkit.plugin.Plugin[] plugins = server.getPluginManager().getPlugins();
 
         result.append(server.getName());
         result.append(" on Bukkit ");