Rework to minimize future need for compatibility with other addons.

Removed BTHNetServerHandler

minecraft/SharedCompatibilityAddonConfig.txt

@@ -0,0 +1,8 @@
+// This class should contain a list of custom NetServerHandler classes for every BTW addon
+// that sends custom network packages. This will ensure compatibility for future releases
+// without needing to keep changing every addon's source code when other addons update.
+// If a new BTW addon is released that also handles custom network packages this list
+// should be updated with it's custom network handler class name, following the same pattern bellow.
+
+class_name=JBNetServerHandler
+class_name=AddonNetServerHandler

minecraft_server/SharedCompatibilityAddonConfig.txt

@@ -0,0 +1,8 @@
+// This class should contain a list of custom NetServerHandler classes for every BTW addon
+// that sends custom network packages. This will ensure compatibility for future releases
+// without needing to keep changing every addon's source code when other addons update.
+// If a new BTW addon is released that also handles custom network packages this list
+// should be updated with it's custom network handler class name, following the same pattern bellow.
+
+class_name=JBNetServerHandler
+class_name=AddonNetServerHandler

src/minecraft/net/minecraft/src/CustomBTWAddonNetServerHandler.java

@@ -0,0 +1,9 @@
+package net.minecraft.src;
+
+import net.minecraft.server.MinecraftServer;
+
+public abstract class CustomBTWAddonNetServerHandler {
+	public CustomBTWAddonNetServerHandler(MinecraftServer aServer, INetworkManager aNetManager, EntityPlayerMP aPlayer) {}
+
+	public void handleCustomPayload(Packet250CustomPayload aPacket) {}	
+}

src/minecraft/net/minecraft/src/GenericBTWAddonNetServerHandler.java

@@ -0,0 +1,97 @@
+package net.minecraft.src;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+
+import net.minecraft.server.MinecraftServer;
+
+public class GenericBTWAddonNetServerHandler extends NetServerHandler {
+	private ArrayList<CustomBTWAddonNetServerHandler> customHandlers = new ArrayList<CustomBTWAddonNetServerHandler>();
+	public final MinecraftServer mcServer;
+	public EntityPlayerMP playerEntity;
+
+	public GenericBTWAddonNetServerHandler(MinecraftServer aServer, INetworkManager aNetManager, EntityPlayerMP aPlayer) {
+		super(aServer, aNetManager, aPlayer);
+
+		this.mcServer = aServer;
+		this.playerEntity = aPlayer;
+
+		String prefix = getClassPackagePrefix();
+		ArrayList<String> classNames = getCustomNetworkListenersClassNames();
+
+		try {
+			for (String className : classNames) {
+				Constructor<?> c = Class.forName(prefix + className).getConstructor(MinecraftServer.class, INetworkManager.class,
+						EntityPlayerMP.class);
+
+				CustomBTWAddonNetServerHandler nsh = (CustomBTWAddonNetServerHandler) c.newInstance(aServer, aNetManager,	aPlayer);
+
+				customHandlers.add(nsh);
+			}
+		} catch (Throwable e) {}
+	}
+
+	public void handleCustomPayload(Packet250CustomPayload aPacket) {
+		for (CustomBTWAddonNetServerHandler netHandler : customHandlers) {
+			netHandler.handleCustomPayload(aPacket);
+		}
+	}
+
+	private static ArrayList<String> getCustomNetworkListenersClassNames() {
+		ArrayList<String> result = new ArrayList<String>();
+		BufferedReader buffer = null;
+
+		try {
+			buffer = new BufferedReader(
+					new InputStreamReader(NetworkListenThread.class.getResourceAsStream("/SharedCompatibilityAddonConfig.txt")));
+		} catch (Throwable e) {
+			// Currently known addons
+			result.add("JBNetServerHandler");
+			result.add("AddonNetServerHandler");
+			return result;
+		}
+
+		try {
+			String line = "";
+
+			while ((line = buffer.readLine()) != null) {
+				String[] value = line.split("=");
+
+				for (int i = 0; i < value.length; ++i) {
+					value[i] = value[i].trim();
+				}
+
+				if (!value[0].equals("class_name")) {
+					continue;
+				}
+
+				result.add(value[1]);
+			}
+
+			buffer.close();
+		} catch (Throwable e) {
+			System.out.println("Failed to load SharedCompatibilityAddonConfig.txt");
+			e.printStackTrace();
+		}
+
+		return result;
+	}
+
+	private String getClassPackagePrefix() {
+		try {
+			if (Class.forName("FCBetterThanWolves") != null) {
+				return "";
+			}
+		} catch (Throwable e) {
+		}
+		try {
+			if (Class.forName("net.minecraft.src.FCBetterThanWolves") != null) {
+				return "net.minecraft.src.";
+			}
+		} catch (Throwable e) {
+		}
+		return "";
+	}
+}

src/minecraft/net/minecraft/src/NetworkListenThread.java

@@ -28,7 +28,7 @@ public void addPlayer(NetServerHandler par1NetServerHandler)
     {
       //DNCode Start
       //this.connections.add(par1NetServerHandler);
-      this.connections.add(new BTHNetServerHandler(this.getServer(), par1NetServerHandler.netManager, par1NetServerHandler.playerEntity));
+      this.connections.add(new GenericBTWAddonNetServerHandler(this.getServer(), par1NetServerHandler.netManager, par1NetServerHandler.playerEntity));
       //DNCode End
     }
 

src/minecraft_server/net/minecraft/src/CustomBTWAddonNetServerHandler.java

@@ -0,0 +1,9 @@
+package net.minecraft.src;
+
+import net.minecraft.server.MinecraftServer;
+
+public abstract class CustomBTWAddonNetServerHandler {
+	public CustomBTWAddonNetServerHandler(MinecraftServer aServer, INetworkManager aNetManager, EntityPlayerMP aPlayer) {}
+
+	public void handleCustomPayload(Packet250CustomPayload aPacket) {}	
+}

src/minecraft_server/net/minecraft/src/GenericBTWAddonNetServerHandler.java

@@ -0,0 +1,97 @@
+package net.minecraft.src;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+
+import net.minecraft.server.MinecraftServer;
+
+public class GenericBTWAddonNetServerHandler extends NetServerHandler {
+	private ArrayList<CustomBTWAddonNetServerHandler> customHandlers = new ArrayList<CustomBTWAddonNetServerHandler>();
+	public final MinecraftServer mcServer;
+	public EntityPlayerMP playerEntity;
+
+	public GenericBTWAddonNetServerHandler(MinecraftServer aServer, INetworkManager aNetManager, EntityPlayerMP aPlayer) {
+		super(aServer, aNetManager, aPlayer);
+
+		this.mcServer = aServer;
+		this.playerEntity = aPlayer;
+
+		String prefix = getClassPackagePrefix();
+		ArrayList<String> classNames = getCustomNetworkListenersClassNames();
+
+		try {
+			for (String className : classNames) {
+				Constructor<?> c = Class.forName(prefix + className).getConstructor(MinecraftServer.class, INetworkManager.class,
+						EntityPlayerMP.class);
+
+				CustomBTWAddonNetServerHandler nsh = (CustomBTWAddonNetServerHandler) c.newInstance(aServer, aNetManager,	aPlayer);
+
+				customHandlers.add(nsh);
+			}
+		} catch (Throwable e) {}
+	}
+
+	public void handleCustomPayload(Packet250CustomPayload aPacket) {
+		for (CustomBTWAddonNetServerHandler netHandler : customHandlers) {
+			netHandler.handleCustomPayload(aPacket);
+		}
+	}
+
+	private static ArrayList<String> getCustomNetworkListenersClassNames() {
+		ArrayList<String> result = new ArrayList<String>();
+		BufferedReader buffer = null;
+
+		try {
+			buffer = new BufferedReader(
+					new InputStreamReader(NetworkListenThread.class.getResourceAsStream("/SharedCompatibilityAddonConfig.txt")));
+		} catch (Throwable e) {
+			// Currently known addons
+			result.add("JBNetServerHandler");
+			result.add("AddonNetServerHandler");
+			return result;
+		}
+
+		try {
+			String line = "";
+
+			while ((line = buffer.readLine()) != null) {
+				String[] value = line.split("=");
+
+				for (int i = 0; i < value.length; ++i) {
+					value[i] = value[i].trim();
+				}
+
+				if (!value[0].equals("class_name")) {
+					continue;
+				}
+
+				result.add(value[1]);
+			}
+
+			buffer.close();
+		} catch (Throwable e) {
+			System.out.println("Failed to load SharedCompatibilityAddonConfig.txt");
+			e.printStackTrace();
+		}
+
+		return result;
+	}
+
+	private String getClassPackagePrefix() {
+		try {
+			if (Class.forName("FCBetterThanWolves") != null) {
+				return "";
+			}
+		} catch (Throwable e) {
+		}
+		try {
+			if (Class.forName("net.minecraft.src.FCBetterThanWolves") != null) {
+				return "net.minecraft.src.";
+			}
+		} catch (Throwable e) {
+		}
+		return "";
+	}
+}

src/minecraft_server/net/minecraft/src/NetworkListenThread.java

@@ -28,7 +28,7 @@ public void addPlayer(NetServerHandler par1NetServerHandler)
     {
       //DNCode Start
       //this.connections.add(par1NetServerHandler);
-      this.connections.add(new BTHNetServerHandler(this.getServer(), par1NetServerHandler.netManager, par1NetServerHandler.playerEntity));
+      this.connections.add(new GenericBTWAddonNetServerHandler(this.getServer(), par1NetServerHandler.netManager, par1NetServerHandler.playerEntity));
       //DNCode End
     }
 
@@ -75,4 +75,4 @@ public MinecraftServer getServer()
     {
         return this.mcServer;
     }
-}
+}