Improve custom tasmod server

.gitignore

@@ -20,4 +20,5 @@ build
 # other
 eclipse
 run/
-logs/
+logs/
+/.apt_generated_tests/

build.gradle

@@ -51,7 +51,7 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.legacyfabric:yarn:${project.minecraft_version}+build.mcp"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
 }
 
 // task for downloading KillTheRng

gradle.properties

@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx3G
 
 # Fabric properties
 minecraft_version=1.12.2
-loader_version=0.14.19
-loom_version=1.2-SNAPSHOT
+loader_version=0.14.23
+loom_version=1.3-SNAPSHOT
 
 # Mod properties
 mod_name=Tool-Assisted Speedrun Mod

src/main/java/com/minecrafttas/common/Common.java

@@ -9,4 +9,10 @@ public class Common {
 	public static final Logger LOGGER = LogManager.getLogger("Common");
 
 	public static final Marker Event = MarkerManager.getMarker("Event");
+
+	public static final Marker Server = MarkerManager.getMarker("Server");
+
+	public static final Marker Client = MarkerManager.getMarker("Client");
+
+	public static final Marker Timeout = MarkerManager.getMarker("Timeout");
 }

src/main/java/com/minecrafttas/common/Configuration.java

@@ -118,7 +118,8 @@ public void delete(ConfigOptions configOption) {
 	}
 
 	public static enum ConfigOptions{
-		FileToOpen("fileToOpen", "");
+		FileToOpen("fileToOpen", ""),
+		ServerConnection("serverConnection", "");
 
 		private String configKey;
 		private String defaultValue;

src/main/java/com/minecrafttas/common/KeybindManager.java

@@ -13,21 +13,23 @@
 
 /**
  * Keybind manager
+ * @author Pancake
  */
-public abstract class KeybindManager implements EventClientGameLoop  {
+public abstract class KeybindManager implements EventClientGameLoop {
 
 	public static class Keybind {
-		
+
 		private KeyBinding keyBinding;
 		private String category;
 		private Runnable onKeyDown;
 
 		/**
 		 * Initialize keybind
-		 * @param name Name of keybind
-		 * @param category Category of keybind
+		 * 
+		 * @param name       Name of keybind
+		 * @param category   Category of keybind
 		 * @param defaultKey Default key of keybind
-		 * @param onKeyDown Will be run when the keybind is pressed
+		 * @param onKeyDown  Will be run when the keybind is pressed
 		 */
 		public Keybind(String name, String category, int defaultKey, Runnable onKeyDown) {
 			this.keyBinding = new KeyBinding(name, defaultKey, category);
@@ -36,16 +38,16 @@ public Keybind(String name, String category, int defaultKey, Runnable onKeyDown)
 		}
 
 	}
-	
+
 	private List<Keybind> keybindings;
-	
+
 	/**
 	 * Initialize keybind manager
 	 */
 	public KeybindManager() {
 		this.keybindings = new ArrayList<>();
 	}
-	
+
 	/**
 	 * Handle registered keybindings on game loop
 	 */
@@ -57,23 +59,24 @@ public void onRunClientGameLoop(Minecraft mc) {
 	}
 
 	protected abstract boolean isKeyDown(KeyBinding i);
-	
+
 	/**
 	 * Register new keybind
-	 * @param keybind Keybind
+	 * 
+	 * @param keybind Keybind to register
 	 */
 	public KeyBinding registerKeybind(Keybind keybind) {
 		this.keybindings.add(keybind);
 		KeyBinding keyBinding = keybind.keyBinding;
-		
+
 		// add category
 		GameSettings options = Minecraft.getMinecraft().gameSettings;
 		if (!KeyBinding.CATEGORY_ORDER.containsKey(keybind.category))
 			KeyBinding.CATEGORY_ORDER.put(keybind.category, KeyBinding.CATEGORY_ORDER.size() + 1);
-		
+
 		// add keybinding
 		options.keyBindings = ArrayUtils.add(options.keyBindings, keyBinding);
 		return keyBinding;
 	}
-	
+
 }

src/main/java/com/minecrafttas/common/events/CompactPacketHandler.java

@@ -0,0 +1,11 @@
+package com.minecrafttas.common.events;
+
+import java.nio.ByteBuffer;
+
+import com.minecrafttas.common.server.exception.PacketNotImplementedException;
+
+@FunctionalInterface
+public interface CompactPacketHandler {
+
+	public void onPacket(ByteBuffer buf, String username) throws PacketNotImplementedException;
+}

src/main/java/com/minecrafttas/common/events/EventClient.java

@@ -1,7 +1,8 @@
 package com.minecrafttas.common.events;
 
 import com.minecrafttas.common.Common;
-import com.minecrafttas.common.events.EventListener.EventBase;
+import com.minecrafttas.common.events.EventListenerRegistry.EventBase;
+import com.minecrafttas.common.server.Client;
 import com.mojang.authlib.GameProfile;
 
 import net.minecraft.client.Minecraft;
@@ -26,7 +27,7 @@ public static interface EventOpenGui extends EventBase {
 
 		public static GuiScreen fireOpenGuiEvent(GuiScreen gui) {
 			Common.LOGGER.trace(Common.Event, "Firing OpenGuiEvent");
-			for (EventBase eventListener : EventListener.getEventListeners()) {
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
 				if(eventListener instanceof EventOpenGui) {
 					EventOpenGui event = (EventOpenGui) eventListener;
 					GuiScreen newGui = event.onOpenGui(gui);
@@ -53,7 +54,7 @@ public static interface EventLaunchIntegratedServer extends EventBase {
 
 		public static void fireOnLaunchIntegratedServer() {
 			Common.LOGGER.trace(Common.Event, "Firing LaunchIntegratedServer");
-			for (EventBase eventListener : EventListener.getEventListeners()) {
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
 				if(eventListener instanceof EventLaunchIntegratedServer) {
 					EventLaunchIntegratedServer event = (EventLaunchIntegratedServer) eventListener;
 					event.onLaunchIntegratedServer();
@@ -76,7 +77,7 @@ public static interface EventDoneLoadingWorld extends EventBase {
 
 		public static void fireOnDoneLoadingWorld() {
 			Common.LOGGER.trace(Common.Event, "Firing DoneLoadingWorld");
-			for (EventBase eventListener : EventListener.getEventListeners()) {
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
 				if(eventListener instanceof EventDoneLoadingWorld) {
 					EventDoneLoadingWorld event = (EventDoneLoadingWorld) eventListener;
 					event.onDoneLoadingWorld();
@@ -99,7 +100,7 @@ public static interface EventClientTick extends EventBase {
 		public void onClientTick(Minecraft mc);
 
 		public static void fireOnClientTick(Minecraft mc) {
-			for (EventBase eventListener : EventListener.getEventListeners()) {
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
 				if(eventListener instanceof EventClientTick) {
 					EventClientTick event = (EventClientTick) eventListener;
 					event.onClientTick(mc);
@@ -123,7 +124,7 @@ public static interface EventClientInit extends EventBase {
 
 		public static void fireOnClientInit(Minecraft mc) {
 			Common.LOGGER.trace(Common.Event, "Firing ClientInit");
-			for (EventBase eventListener : EventListener.getEventListeners()) {
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
 				if(eventListener instanceof EventClientInit) {
 					EventClientInit event = (EventClientInit) eventListener;
 					event.onClientInit(mc);
@@ -146,7 +147,7 @@ public static interface EventClientGameLoop extends EventBase {
 		public void onRunClientGameLoop(Minecraft mc);
 
 		public static void fireOnClientGameLoop(Minecraft mc) {
-			for (EventBase eventListener : EventListener.getEventListeners()) {
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
 				if(eventListener instanceof EventClientGameLoop) {
 					EventClientGameLoop event = (EventClientGameLoop) eventListener;
 					event.onRunClientGameLoop(mc);
@@ -170,7 +171,7 @@ public static interface EventCamera extends EventBase {
 		public CameraData onCameraEvent(CameraData dataIn);
 
 		public static CameraData fireCameraEvent(CameraData dataIn) {
-			for (EventBase eventListener : EventListener.getEventListeners()) {
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
 				if(eventListener instanceof EventCamera) {
 					EventCamera event = (EventCamera) eventListener;
 					CameraData data = event.onCameraEvent(dataIn);
@@ -223,7 +224,7 @@ public static interface EventPlayerLeaveClientSide extends EventBase {
 
 		public static void firePlayerLeaveClientSide(EntityPlayerSP player) {
 			Common.LOGGER.trace(Common.Event, "Firing PlayerLeaveClientSideEvent");
-			for (EventBase eventListener : EventListener.getEventListeners()) {
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
 				if(eventListener instanceof EventPlayerLeaveClientSide) {
 					EventPlayerLeaveClientSide event = (EventPlayerLeaveClientSide) eventListener;
 					event.onPlayerLeaveClientSide(player);
@@ -247,7 +248,7 @@ public static interface EventPlayerJoinedClientSide extends EventBase {
 
 		public static void firePlayerJoinedClientSide(EntityPlayerSP player) {
 			Common.LOGGER.trace(Common.Event, "Firing PlayerJoinedClientSide");
-			for (EventBase eventListener : EventListener.getEventListeners()) {
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
 				if(eventListener instanceof EventPlayerJoinedClientSide) {
 					EventPlayerJoinedClientSide event = (EventPlayerJoinedClientSide) eventListener;
 					event.onPlayerJoinedClientSide(player);
@@ -264,21 +265,44 @@ public static void firePlayerJoinedClientSide(EntityPlayerSP player) {
 	 */
 	public static interface EventOtherPlayerJoinedClientSide extends EventBase {
 
-		public void onOtherPlayerJoinedClientSide(GameProfile profile);
-
 		/**
 		 * Fired when a different player other than yourself joins a server or a world
 		 * @param player The game profile of the player that joins the server or the world
 		 */
+		public void onOtherPlayerJoinedClientSide(GameProfile profile);
+
+
 		public static void fireOtherPlayerJoinedClientSide(GameProfile profile) {
 			Common.LOGGER.trace(Common.Event, "Firing OtherPlayerJoinedClientSide");
-			for (EventBase eventListener : EventListener.getEventListeners()) {
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
 				if(eventListener instanceof EventOtherPlayerJoinedClientSide) {
 					EventOtherPlayerJoinedClientSide event = (EventOtherPlayerJoinedClientSide) eventListener;
 					event.onOtherPlayerJoinedClientSide(profile);
 				}
 			}
 		}
-
+
+	}
+
+	/**
+	 * Fired when the connection to the custom server was closed on the client side.
+	 */
+	public static interface EventDisconnectClient extends EventBase {
+
+		/**
+		 * Fired when the connection to the custom server was closed on the client side.
+		 * @param client The client that is disconnecting
+		 */
+		public void onDisconnectClient(Client client);
+
+		public static void fireDisconnectClient(Client client) {
+			Common.LOGGER.trace(Common.Event, "Firing EventDisconnectClient");
+			for (EventBase eventListener : EventListenerRegistry.getEventListeners()) {
+				if(eventListener instanceof EventDisconnectClient) {
+					EventDisconnectClient event = (EventDisconnectClient) eventListener;
+					event.onDisconnectClient(client);
+				}
+			}
+		}
 	}
 }

src/main/java/com/minecrafttas/common/events/EventListener.java → src/main/java/com/minecrafttas/common/events/EventListenerRegistry.java

@@ -2,16 +2,22 @@
 
 import java.util.ArrayList;
 
-public class EventListener {
+public class EventListenerRegistry {
 
 	private static ArrayList<EventBase> EVENTLISTENER_REGISTRY = new ArrayList<>();
 
 
 	public static void register(EventBase eventListener) {
+		if (eventListener == null) {
+			throw new NullPointerException("Tried to register a packethandler with value null");
+		}
 		EVENTLISTENER_REGISTRY.add(eventListener);
 	}
 
 	public static void unregister(EventBase eventListener) {
+		if (eventListener == null) {
+			throw new NullPointerException("Tried to unregister a packethandler with value null");
+		}
 		EVENTLISTENER_REGISTRY.remove(eventListener);
 	}