Refactor PlaybackSerialiser

.gitattributes

@@ -0,0 +1,2 @@
+*.java diff=java
+*.md diff=markdown

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

@@ -5,40 +5,76 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.InvalidPropertiesFormatException;
-import java.util.Map;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Properties;
 
+import com.minecrafttas.mctcommon.Configuration.ConfigOptions;
+import com.minecrafttas.mctcommon.registry.AbstractRegistry;
+import com.minecrafttas.mctcommon.registry.Registerable;
 
 /**
  * A <i>very</i> simple configuration class
+ * 
  * @author Scribble
- *
  */
 
-public class Configuration {
-	
+public class Configuration extends AbstractRegistry<ConfigOptions> {
+
 	private File file;
-	
+
 	private Properties properties;
 
 	private String comment;
-	
+
 	public Configuration(String comment, File configFile) {
+		super("Configuration", new LinkedHashMap<>());
+
 		file = configFile;
 		this.comment = comment;
+	}
+
+	protected final List<ConfigOptions> configRegistry = new ArrayList<>();
+
+	@Override
+	public void register(ConfigOptions registryObject) {
+		if(registryObject == null) {
+			return;
+		}
+
+		if(configRegistry.contains(registryObject)) {
+			return;
+		}
+
+		configRegistry.add(registryObject);
+	}
+
+	@Override
+	public void unregister(ConfigOptions registryObject) {
+		if (registryObject == null) {
+			return;
+		}
+
+		if (!configRegistry.contains(registryObject)) {
+			return;
+		}
 
-		if(file.exists()) {
-			properties = load();
+		configRegistry.remove(registryObject);
+	}
+
+	public void load() {
+		if (file.exists()) {
+			properties = loadInner();
 		}
-		if(properties == null || !file.exists()) {
+		if (properties == null || !file.exists()) {
 			properties = generateDefault();
 			save();
-		}
+		}		
 	}
 
-	public Properties load() {
+	private Properties loadInner() {
 		FileInputStream fis;
 		Properties newProp = new Properties();
 		try {
@@ -57,11 +93,11 @@ public Properties load() {
 		}
 		return newProp;
 	}
-	
+
 	public void save() {
 		save(file);
 	}
-	
+
 	public void save(File file) {
 		try {
 			FileOutputStream fos = new FileOutputStream(file);
@@ -71,73 +107,62 @@ public void save(File file) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public Properties generateDefault() {
 		Properties newProperties = new Properties();
-		newProperties.putAll(ConfigOptions.getDefaultValues());
+		configRegistry.forEach((configOption)->{
+			newProperties.put(configOption.getConfigKey(), configOption.getDefaultValue());
+		});
 		return newProperties;
 	}
-	
+
 	public String get(ConfigOptions configOption) {
-		return properties.getProperty(configOption.configKey);
+		return properties.getProperty(configOption.getConfigKey(), configOption.getDefaultValue());
 	}
-	
+
 	public int getInt(ConfigOptions configOption) {
 		return Integer.parseInt(get(configOption));
 	}
-	
+
 	public boolean getBoolean(ConfigOptions configOption) {
 		return Boolean.parseBoolean(get(configOption));
 	}
-	
+
 	public boolean has(ConfigOptions configOption) {
-		return properties.contains(configOption.configKey);
+		return properties.contains(configOption.getConfigKey());
 	}
-	
+
 	public void set(ConfigOptions configOption, String value) {
-		properties.setProperty(configOption.configKey, value);
+		if(properties == null) {
+			throw new NullPointerException("Config needs to be loaded first, before trying to set a value");
+		}
+		properties.setProperty(configOption.getConfigKey(), value);
 		save();
 	}
-	
+
 	public void set(ConfigOptions configOption, int value) {
 		String val = Integer.toString(value);
 		set(configOption, val);
 	}
-	
+
 	public void set(ConfigOptions configOption, boolean value) {
 		String val = Boolean.toString(value);
 		set(configOption, val);
 	}
-	
+
 	public void reset(ConfigOptions configOption) {
-		set(configOption, configOption.defaultValue);
+		set(configOption, configOption.getDefaultValue());
 	}
-	
+
 	public void delete(ConfigOptions configOption) {
 		properties.remove(configOption);
 		save();
 	}
-
-	public static enum ConfigOptions{
-		FileToOpen("fileToOpen", ""),
-		ServerConnection("serverConnection", "");
-
-		private String configKey;
-		private String defaultValue;
-
-		private ConfigOptions(String configKey, String defaultValue) {
-			this.configKey = configKey;
-			this.defaultValue = defaultValue;
-		}
-
-		public static Map<String, String> getDefaultValues() {
-			Map<String, String> out = new HashMap<>();
-			for (ConfigOptions configthing : values()) {
-				if(configthing.defaultValue!=null) {
-					out.put(configthing.configKey, configthing.defaultValue);
-				}
-			}
-			return out;
-		}
+
+	public interface ConfigOptions extends Registerable {
+
+		public String getDefaultValue();
+
+		public String getConfigKey();
 	}
 }

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

@@ -23,10 +23,10 @@ public class KeybindManager implements EventClientGameLoop {
 
 	public static class Keybind {
 
-		private KeyBinding keyBinding;
-		private String category;
-		private Runnable onKeyDown;
-		private IsKeyDownFunc isKeyDownFunc;
+		public final KeyBinding vanillaKeyBinding;
+		private final String category;
+		private final Runnable onKeyDown;
+		private final IsKeyDownFunc isKeyDownFunc;
 
 		/**
 		 * Initialize keybind
@@ -49,12 +49,16 @@ public Keybind(String name, String category, int defaultKey, Runnable onKeyDown)
 		 * @param onKeyDown  Will be run when the keybind is pressed
 		 */
 		public Keybind(String name, String category, int defaultKey, Runnable onKeyDown, IsKeyDownFunc func) {
-			this.keyBinding = new KeyBinding(name, defaultKey, category);
+			this.vanillaKeyBinding = new KeyBinding(name, defaultKey, category);
 			this.category = category;
 			this.onKeyDown = onKeyDown;
 			this.isKeyDownFunc = func;
 		}
 
+		@Override
+		public String toString() {
+			return this.vanillaKeyBinding.getKeyDescription();
+		}
 	}
 
 	private List<Keybind> keybindings;
@@ -77,7 +81,7 @@ public KeybindManager(IsKeyDownFunc defaultFunction) {
 	public void onRunClientGameLoop(Minecraft mc) {
 		for (Keybind keybind : this.keybindings){
 			IsKeyDownFunc keyDown = keybind.isKeyDownFunc != null ? keybind.isKeyDownFunc : defaultFunction;
-			if(keyDown.isKeyDown(keybind.keyBinding)){
+			if(keyDown.isKeyDown(keybind.vanillaKeyBinding)){
 				keybind.onKeyDown.run();
 			}
 		}
@@ -89,9 +93,9 @@ public void onRunClientGameLoop(Minecraft mc) {
 	 * 
 	 * @param keybind Keybind to register
 	 */
-	public KeyBinding registerKeybind(Keybind keybind) {
+	public void registerKeybind(Keybind keybind) {
 		this.keybindings.add(keybind);
-		KeyBinding keyBinding = keybind.keyBinding;
+		KeyBinding keyBinding = keybind.vanillaKeyBinding;
 
 		// add category
 		GameSettings options = Minecraft.getMinecraft().gameSettings;
@@ -100,9 +104,8 @@ public KeyBinding registerKeybind(Keybind keybind) {
 
 		// add keybinding
 		options.keyBindings = ArrayUtils.add(options.keyBindings, keyBinding);
-		return keyBinding;
 	}
-
+	
 	@FunctionalInterface
 	public static interface IsKeyDownFunc {
 

src/main/java/com/minecrafttas/mctcommon/LanguageManager.java

@@ -1,19 +1,26 @@
 package com.minecrafttas.mctcommon;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import org.apache.commons.io.IOUtils;
+
 import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
 import com.google.gson.Gson;
+
 import net.minecraft.client.resources.IResource;
 import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.util.ResourceLocation;
-import org.apache.commons.io.IOUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.regex.Pattern;
 
 public class LanguageManager {
 

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

@@ -1,7 +1,7 @@
 package com.minecrafttas.mctcommon.events;
 
 import com.minecrafttas.mctcommon.events.EventListenerRegistry.EventBase;
-import com.minecrafttas.mctcommon.server.Client;
+import com.minecrafttas.mctcommon.networking.Client;
 import com.mojang.authlib.GameProfile;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/minecrafttas/mctcommon/events/EventServer.java

@@ -1,7 +1,7 @@
 package com.minecrafttas.mctcommon.events;
 
 import com.minecrafttas.mctcommon.events.EventListenerRegistry.EventBase;
-import com.minecrafttas.mctcommon.server.Client;
+import com.minecrafttas.mctcommon.networking.Client;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;

src/main/java/com/minecrafttas/mctcommon/server/ByteBufferBuilder.java → src/main/java/com/minecrafttas/mctcommon/networking/ByteBufferBuilder.java

@@ -1,10 +1,10 @@
-package com.minecrafttas.mctcommon.server;
+package com.minecrafttas.mctcommon.networking;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.UUID;
 
-import com.minecrafttas.mctcommon.server.interfaces.PacketID;
+import com.minecrafttas.mctcommon.networking.interfaces.PacketID;
 
 /**
  * Helper method for creating byte buffers which get pooled from a

src/main/java/com/minecrafttas/mctcommon/server/Client.java → src/main/java/com/minecrafttas/mctcommon/networking/Client.java

@@ -1,9 +1,9 @@
-package com.minecrafttas.mctcommon.server;
+package com.minecrafttas.mctcommon.networking;
 
 import static com.minecrafttas.mctcommon.MCTCommon.Client;
 import static com.minecrafttas.mctcommon.MCTCommon.LOGGER;
 import static com.minecrafttas.mctcommon.MCTCommon.Server;
-import static com.minecrafttas.mctcommon.server.SecureList.BUFFER_SIZE;
+import static com.minecrafttas.mctcommon.networking.SecureList.BUFFER_SIZE;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -22,10 +22,10 @@
 import com.minecrafttas.mctcommon.events.EventClient.EventDisconnectClient;
 import com.minecrafttas.mctcommon.events.EventListenerRegistry;
 import com.minecrafttas.mctcommon.events.EventServer.EventClientCompleteAuthentication;
-import com.minecrafttas.mctcommon.server.exception.InvalidPacketException;
-import com.minecrafttas.mctcommon.server.exception.PacketNotImplementedException;
-import com.minecrafttas.mctcommon.server.exception.WrongSideException;
-import com.minecrafttas.mctcommon.server.interfaces.PacketID;
+import com.minecrafttas.mctcommon.networking.exception.InvalidPacketException;
+import com.minecrafttas.mctcommon.networking.exception.PacketNotImplementedException;
+import com.minecrafttas.mctcommon.networking.exception.WrongSideException;
+import com.minecrafttas.mctcommon.networking.interfaces.PacketID;
 
 /**
  * A custom asynchronous client

src/main/java/com/minecrafttas/mctcommon/server/CompactPacketHandler.java → src/main/java/com/minecrafttas/mctcommon/networking/CompactPacketHandler.java

@@ -1,8 +1,8 @@
-package com.minecrafttas.mctcommon.server;
+package com.minecrafttas.mctcommon.networking;
 
 import java.nio.ByteBuffer;
 
-import com.minecrafttas.mctcommon.server.exception.PacketNotImplementedException;
+import com.minecrafttas.mctcommon.networking.exception.PacketNotImplementedException;
 
 @FunctionalInterface
 public interface CompactPacketHandler {