[Savestates] Rewrite Savestate-Indexer

gradle.properties

@@ -16,5 +16,5 @@ mod_email=scribble@minecrafttas.com
 # TASmod properties
 group=com.minecrafttas
 artifact=TASmod-1.12.2
-version=Beta1.2
+version=Beta2
 release=false

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

@@ -1,5 +1,6 @@
 package com.minecrafttas.mctcommon;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Properties;
@@ -23,16 +24,37 @@ public Configuration(String comment, Path configFile, ConfigurationRegistry regi
 	}
 
 	@Override
-	public void loadFromXML() {
+	public void load() {
+
 		if (Files.exists(file)) {
-			loadFromXML(file);
+			String in = null;
+			try {
+				in = readFile(file);
+			} catch (IOException e) {
+				MCTCommon.LOGGER.catching(e);
+				return;
+			}
+
+			if (in.startsWith("<?xml")) {
+				MCTCommon.LOGGER.warn("Converting xml config to json");
+				loadFromXML();
+				return;
+			}
+
+			loadFromJson(file);
 		}
+
 		if (properties == null || !Files.exists(file)) {
 			properties = generateDefault();
-			saveToXML();
+			saveToJson();
 		}
 	}
 
+	@Override
+	public void save() {
+		super.saveToJson();
+	}
+
 	/**
 	 * Generates the default property list from the values provided in {@link #registry}
 	 * @return The default property list
@@ -67,7 +89,7 @@ public void set(ConfigOptions configOption, String value) {
 			throw new NullPointerException("Config needs to be loaded first, before trying to set a value");
 		}
 		properties.setProperty(configOption.getConfigKey(), value);
-		saveToXML();
+		save();
 	}
 
 	public void set(ConfigOptions configOption, int value) {
@@ -86,6 +108,6 @@ public void reset(ConfigOptions configOption) {
 
 	public void delete(ConfigOptions configOption) {
 		properties.remove(configOption);
-		saveToXML();
+		saveToJson();
 	}
 }

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

@@ -1,7 +1,7 @@
 package com.minecrafttas.mctcommon;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.commons.lang3.ArrayUtils;
 
@@ -21,47 +21,7 @@ public class KeybindManager implements EventClientGameLoop {
 
 	private final IsKeyDownFunc defaultFunction;
 
-	public static class Keybind {
-
-		public final KeyBinding vanillaKeyBinding;
-		private final String category;
-		private final Runnable onKeyDown;
-		private final IsKeyDownFunc isKeyDownFunc;
-
-		/**
-		 * Initialize 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
-		 */
-		public Keybind(String name, String category, int defaultKey, Runnable onKeyDown) {
-			this(name, category, defaultKey, onKeyDown, null);
-		}
-
-		/**
-		 * Initialize keybind with a different "isKeyDown" method
-		 * 
-		 * @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
-		 */
-		public Keybind(String name, String category, int defaultKey, Runnable onKeyDown, IsKeyDownFunc func) {
-			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;
+	private Map<KeybindID, Keybind> keybindings;
 
 	/**
 	 * Initialize keybind manage
@@ -71,15 +31,15 @@ public String toString() {
 	 */
 	public KeybindManager(IsKeyDownFunc defaultFunction) {
 		this.defaultFunction = defaultFunction;
-		this.keybindings = new ArrayList<>();
+		this.keybindings = new HashMap<>();
 	}
 
 	/**
 	 * Handle registered keybindings on game loop
 	 */
 	@Override
 	public void onRunClientGameLoop(Minecraft mc) {
-		for (Keybind keybind : this.keybindings) {
+		for (Keybind keybind : this.keybindings.values()) {
 			IsKeyDownFunc keyDown = keybind.isKeyDownFunc != null ? keybind.isKeyDownFunc : defaultFunction;
 			if (keyDown.isKeyDown(keybind.vanillaKeyBinding)) {
 				keybind.onKeyDown.run();
@@ -88,26 +48,87 @@ public void onRunClientGameLoop(Minecraft mc) {
 
 	}
 
+	public void registerKeybinds(GameSettings options, Class<? extends KeybindID> keybindIDclass) {
+		if (keybindIDclass.isEnum())
+			registerKeybinds(options, keybindIDclass.getEnumConstants());
+	}
+
+	public void registerKeybinds(GameSettings options, KeybindID... keybind) {
+		for (KeybindID keybindEnum : keybind) {
+			registerKeybind(options, keybindEnum, keybindEnum.getKeybind());
+		}
+	}
+
 	/**
-	 * Register new keybind
+	 * Register a new keybind
 	 * 
-	 * @param keybind Keybind to register
-	 * @param options 
+	 * @param keybindID The {@link KeybindID} to register this underI 
+	 * @param keybind The {@link Keybind} to register
 	 */
-	public void registerKeybind(Keybind keybind, GameSettings options) {
-		this.keybindings.add(keybind);
+	public void registerKeybind(GameSettings options, KeybindID keybindID, Keybind keybind) {
+		this.keybindings.put(keybindID, keybind);
 		KeyBinding keyBinding = keybind.vanillaKeyBinding;
 
-		if (!AccessorKeyBinding.getCategoryOrder().containsKey(keybind.category))
-			AccessorKeyBinding.getCategoryOrder().put(keybind.category, AccessorKeyBinding.getCategoryOrder().size() + 1);
+		Map<String, Integer> categoryOrder = AccessorKeyBinding.getCategoryOrder();
+
+		if (!categoryOrder.containsKey(keybind.category))
+			categoryOrder.put(keybind.category, categoryOrder.size() + 1);
 
 		// add keybinding
 		options.keyBindings = ArrayUtils.add(options.keyBindings, keyBinding);
 	}
 
+	public Keybind getKeybind(KeybindID id) {
+		return keybindings.get(id);
+	}
+
 	@FunctionalInterface
 	public static interface IsKeyDownFunc {
 
 		public boolean isKeyDown(KeyBinding keybind);
 	}
+
+	public static interface KeybindID {
+		public Keybind getKeybind();
+	}
+
+	public static class Keybind {
+
+		public final KeyBinding vanillaKeyBinding;
+		private final String category;
+		private final Runnable onKeyDown;
+		private final IsKeyDownFunc isKeyDownFunc;
+
+		/**
+		 * Initialize 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
+		 */
+		public Keybind(String name, String category, int defaultKey, Runnable onKeyDown) {
+			this(name, category, defaultKey, onKeyDown, null);
+		}
+
+		/**
+		 * Initialize keybind with a different "isKeyDown" method
+		 * 
+		 * @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
+		 */
+		public Keybind(String name, String category, int defaultKey, Runnable onKeyDown, IsKeyDownFunc func) {
+			this.vanillaKeyBinding = new KeyBinding(name, defaultKey, category);
+			this.category = category;
+			this.onKeyDown = onKeyDown;
+			this.isKeyDownFunc = func;
+		}
+
+		@Override
+		public String toString() {
+			return this.vanillaKeyBinding.getKeyDescription();
+		}
+	}
 }

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

@@ -255,7 +255,7 @@ public static Object fireEvent(Class<? extends EventListenerRegistry.EventBase>
 						if (newReturnValue != null)
 							returnValue = newReturnValue;
 					} catch (IllegalAccessException | InvocationTargetException e) {
-						throw new EventException(eventClass, e);
+						throw new EventException(eventClass, e.getCause());
 					} catch (IllegalArgumentException e) {
 						throw new EventException(String.format("Event fired with the wrong number of parameters. Expected: %s, Actual: %s", method.getParameterCount(), eventParams.length), eventClass, e);
 					}