Massive renaming update in nms. If you bypassed Bukkit, you will likely break.

Also minimized all the nms diffs and generic cleanups all around.

1 files changed, 4 insertions, 13 deletions

diff --git a/src/main/java/net/minecraft/server/ThreadCommandReader.java b/src/main/java/net/minecraft/server/ThreadCommandReader.java
index 03c0a613..821cf660 100644
--- a/src/main/java/net/minecraft/server/ThreadCommandReader.java
+++ b/src/main/java/net/minecraft/server/ThreadCommandReader.java
@@ -4,13 +4,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-// CraftBukkit start
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import jline.ConsoleReader;
-import org.bukkit.craftbukkit.Main;
-// CraftBukkit end
-
 public class ThreadCommandReader extends Thread {
 
     final MinecraftServer server;
@@ -20,27 +13,25 @@ public class ThreadCommandReader extends Thread {
     }
 
     public void run() {
-        // CraftBukkit start
-        ConsoleReader bufferedreader = this.server.reader;
+        jline.ConsoleReader bufferedreader = this.server.reader; // CraftBukkit
         String s = null;
-        // CraftBukkit end
 
         try {
             // CraftBukkit start - JLine disabling compatibility
             while (!this.server.isStopped && MinecraftServer.isRunning(this.server)) {
-                if (Main.useJline) {
+                if (org.bukkit.craftbukkit.Main.useJline) {
                     s = bufferedreader.readLine(">", null);
                 } else {
                     s = bufferedreader.readLine();
                 }
                 if (s != null) {
-                    // CraftBukkit end
                     this.server.issueCommand(s, this.server);
                 }
+                // CraftBukkit end
             }
         } catch (IOException ioexception) {
             // CraftBukkit
-            Logger.getLogger(ThreadCommandReader.class.getName()).log(Level.SEVERE, null, ioexception);
+            java.util.logging.Logger.getLogger(ThreadCommandReader.class.getName()).log(java.util.logging.Level.SEVERE, null, ioexception);
         }
     }
 }