Removed the proxy and added the MineOnline protocol.

res/plugin.yml

@@ -1,6 +1,6 @@
 name: OnlineModeFix
-version: 1.0.0
-description: Fixes online-mode authentication
+version: 1.1.0
+description: Fixes online-mode authentication.
 author: craftycodie
 authors: [Codie]
 website: https://twitter.com/craftycodie

src/OnlineModeFix.java

@@ -1,34 +1,20 @@
-
-import gg.codie.mineonline.plugin.ProxyThread;
+import gg.codie.mineonline.protocol.MineOnlineURLStreamHandlerFactory;
 
 import java.io.*;
-import java.net.ServerSocket;
+import java.net.URL;
 import java.util.Properties;
 import java.util.logging.Logger;
 
 public class OnlineModeFix extends Plugin {
     private static String NAME = "OnlineModeFix";
     Logger log;
-    ProxyThread proxyThread;
-    boolean initialized;
-
-    public void launchProxy() throws IOException {
-        ServerSocket serverSocket = new ServerSocket(0);
-        proxyThread = new ProxyThread(serverSocket);
-        proxyThread.start();
 
-        System.out.println("Enabling online-mode fix.");
+    public void enableOnlineMode() {
+        this.log = Logger.getLogger("Minecraft");
 
-        System.setProperty("http.proxyHost", serverSocket.getInetAddress().getHostAddress());
-        System.setProperty("http.proxyPort", "" + serverSocket.getLocalPort());
-        System.setProperty("http.nonProxyHosts", "localhost|127.0.0.1");
-    }
+        log.info("Enabling online-mode fix.");
 
-    public void stopProxy() {
-        if (proxyThread != null) {
-            proxyThread.stop();
-            proxyThread = null;
-        }
+        URL.setURLStreamHandlerFactory(new MineOnlineURLStreamHandlerFactory());
     }
 
     public void enable() {
@@ -38,23 +24,7 @@ public void enable() {
     }
 
     public void initialize() {
-        if (initialized)
-            return;
-
-        this.log = Logger.getLogger("Minecraft");
-
-        Properties propertiesFile = new Properties();
-
-        try {
-            propertiesFile.load(new FileInputStream(new File("server.properties")));
-            boolean onlineMode = propertiesFile.getProperty("online-mode", "true").equals("true");
-
-            if (onlineMode)
-                launchProxy();
-        } catch (Exception ex) {
-            log.warning("Failed to enable online-mode fix. Authentication may fail.");
-        }
-        initialized = true;
+        enableOnlineMode();
     }
 
     private void register(PluginLoader.Hook hook, PluginListener.Priority priority) {
@@ -70,13 +40,6 @@ private void register(PluginLoader.Hook hook) {
     }
 
     public void disable() {
-        if (!initialized)
-            return;
-
-        unregister();
-
-        stopProxy();
 
-        initialized = false;
     }
 }